From 5a8728d62aa39ae16eb3f1daf2bf61a3c46124ed Mon Sep 17 00:00:00 2001 From: Marcin Wojdyr Date: Thu, 25 May 2023 20:14:41 +0200 Subject: [PATCH] update for 0.6.2 --- .github/workflows/wheels.yml | 4 ++-- CMakeLists.txt | 2 +- README.md | 22 +++++++++++++++------- pyproject.toml | 4 ++-- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index d455f88..dc81e12 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v3 - name: Build wheels - uses: pypa/cibuildwheel@v2.12.2 + uses: pypa/cibuildwheel@v2.12.3 env: CIBW_BUILD: ${{ github.event.inputs.cibw_build }} CIBW_SKIP: ${{ github.event.inputs.cibw_skip }} @@ -43,5 +43,5 @@ jobs: - uses: actions/upload-artifact@v3 with: - name: wheels + name: program_wheels path: wheelhouse/*.whl diff --git a/CMakeLists.txt b/CMakeLists.txt index 41efe9b..618db61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ include(FetchContent) FetchContent_Declare( gemmi GIT_REPOSITORY https://github.com/project-gemmi/gemmi.git - GIT_TAG 7639b1f421207db15d76d1d5f7a813990a634633 # v0.6.1 + GIT_TAG 3f7b8d74971a0ee009347ceb5ae6780023861e62 # v0.6.2 ) # We don't want to install all gemmi files. diff --git a/README.md b/README.md index 0a96616..894df7f 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,24 @@ ## gemmi executable in a wheel -Packaging [gemmi](https://gemmi.readthedocs.io/en/latest/utils.html), -a command-line program from a crystallographic / structural biology project -also called [gemmi](https://gemmi.readthedocs.io/en/latest/utils.html), -as a python wheel that installable with pip. +Here we provide the command-line program +[gemmi](https://gemmi.readthedocs.io/en/latest/utils.html) +in [wheels](https://github.com/project-gemmi/gemmi_program_wheel). +It is, in PyPI, distributed separately from the Python extension module +[gemmi](https://pypi.org/project/gemmi/), +because, unlike the module, it does not depend on Python version. -### how to make wheels after gemmi release +### notes for myself -- how to make wheels after gemmi release * update `GIT_TAG` in CMakeLists.txt and `version` in pyproject.toml * (optionally) update version of cibuildwheel in .github/workflows/wheels.yml + and scikit-build-core in pyproject.toml * test locally with `pip wheel .` * make source distribution of this repo: `python -m build --sdist` -* build wheels in GitHub Actions -* download the wheels, check them, upload sdist and wheels to PyPI +* git push changes to build wheels in [GitHub Actions][1] +* download the wheels, check them, upload sdist and wheels to PyPI: + + twine upload dist/gemmi-program-$VERSION.tar.gz + twine upload wheels/gemmi_program-$VERSION-*.whl + +[1]: https://github.com/project-gemmi/gemmi_program_wheel/actions diff --git a/pyproject.toml b/pyproject.toml index 582a2a3..4f9397c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,10 @@ [build-system] -requires = ["scikit-build-core==0.2.1"] +requires = ["scikit-build-core==0.4.2"] build-backend = "scikit_build_core.build" [project] name = "gemmi-program" -version = "0.6.1" +version = "0.6.2" requires-python = ">=3.8" description="gemmi (program executable only)" readme = "README.md"