Skip to content

Commit

Permalink
Fix README issues, update .gitignore and update pypi deploy dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
gsleap committed Sep 12, 2023
1 parent 24a43c8 commit 93a91c3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ include/
ccov.zip
/test_files/1101503312_mwax_vcs/*.sub
/test_files/1101503312_vcs/*.dat
/test_files/1370755832_mwax_vcs_os/*.sub
/test_files/1370755832_mwax_vcs_os/*.sub
.python-version
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ mwalib provides the following binaries and implementations with releases startin
|mwalib-vX.X.X-macosx-x86-64.tar.gz | MacOSX "C"/"C++" compatible library - includes ".h" and "libmwalib.a" and "libmwalib.so" library files. |
|mwalib-vX.X.X-macosx-python-x86-64.tar.gz | MacOSX compatible Python wheel. |

NOTE: for both MacOSX and Linux, more optimised build are named with a v2 and v3 after the "x86-64". These suffixes denote that the compilation was optimised for the specified [CPU microarchitecture levels](https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels), with "x86-64" being the most compatible with the very oldest CPUs. If you have a CPU which was manufactured after 2008 you are safe with x86-64-v2, and if it is newer than 2015 then you are safe using
x86-64-v3.
NOTE: for both Linux, more optimised builds are named with a v2 and v3 after the "x86-64". These suffixes denote that the compilation was optimised for the specified [CPU microarchitecture levels](https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels), with "x86-64" being the most compatible with the very oldest CPUs. If you have a CPU which was manufactured after 2008 you are safe with x86-64-v2, and if it is newer than 2015 then you are safe using x86-64-v3.

----
For installation instructions, concepts and usage info, please see the [`mwalib GitHub Wiki`](https://github.com/MWATelescope/mwalib/wiki).
Expand Down
16 changes: 4 additions & 12 deletions tools/pypi_deploy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,14 @@
# Once at the prompt, build with:
# maturin build --release --cargo-extra-args="--features python,cfitsio-static,examples" --strip --manylinux 2014
#
# Publish with:
# Publish to the test pypi repository first, with (where PYPI_TOKEN is a token generated from https://test.pypi.org):
# maturin publish --cargo-extra-args="--features python,cfitsio-static,examples" --manylinux 2014 --username __token__ --password PYPI_TOKEN --repository-url https://test.pypi.org/legacy/
#
# Publish to the real pypi repository, with (where USERNAME and PASSWORD are valid):
# maturin publish --cargo-extra-args="--features python,cfitsio-static,examples" --manylinux 2014 --username USERNAME --password PASSWORD
#
FROM konstin2/maturin

WORKDIR /
ADD https://github.com/Kitware/CMake/releases/download/v3.19.1/cmake-3.19.1.tar.gz .
RUN tar -xf cmake-3.19.1.tar.gz && \
cd cmake-3.19.1 && \
./bootstrap -- -DCMAKE_USE_OPENSSL=OFF && \
make -j8 install && \
cd .. && \
rm -r cmake*

WORKDIR /io

RUN rustup install 1.63 --no-self-update
Expand All @@ -33,6 +27,4 @@ RUN rustup default 1.63

RUN rm -rf /io/target

RUN cargo update

ENTRYPOINT ["/bin/bash"]

0 comments on commit 93a91c3

Please sign in to comment.