From 93a91c34e2e4a69adbebe4f973fbc1d2d1c9bccc Mon Sep 17 00:00:00 2001 From: Greg Sleap Date: Tue, 12 Sep 2023 16:07:11 +0800 Subject: [PATCH] Fix README issues, update .gitignore and update pypi deploy dockerfile --- .gitignore | 3 ++- README.md | 3 +-- tools/pypi_deploy/Dockerfile | 16 ++++------------ 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 102f930..288b58b 100644 --- a/.gitignore +++ b/.gitignore @@ -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 \ No newline at end of file +/test_files/1370755832_mwax_vcs_os/*.sub +.python-version diff --git a/README.md b/README.md index 07d2d9e..4d301c3 100644 --- a/README.md +++ b/README.md @@ -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). diff --git a/tools/pypi_deploy/Dockerfile b/tools/pypi_deploy/Dockerfile index 3dd3c08..5f84117 100644 --- a/tools/pypi_deploy/Dockerfile +++ b/tools/pypi_deploy/Dockerfile @@ -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 @@ -33,6 +27,4 @@ RUN rustup default 1.63 RUN rm -rf /io/target -RUN cargo update - ENTRYPOINT ["/bin/bash"] \ No newline at end of file