From fbe10476117eefba7101a9231e5063c906af8ac5 Mon Sep 17 00:00:00 2001 From: Marcin Wojdyr Date: Tue, 19 Dec 2023 16:00:40 +0100 Subject: [PATCH] update for v0.6.4 --- .github/workflows/wheels.yml | 8 +++----- .gitignore | 1 + CMakeLists.txt | 4 +++- README.md | 2 +- pyproject.toml | 8 ++++++-- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 9b01e8d..5783110 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -21,22 +21,20 @@ jobs: include: - os: ubuntu-22.04 arch: "x86_64" - - os: windows-2019 + - os: windows-2022 arch: "AMD64" - os: macos-11 arch: "x86_64 arm64" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.15.0 + uses: pypa/cibuildwheel@v2.16.2 env: CIBW_BUILD: ${{ github.event.inputs.cibw_build }} CIBW_SKIP: ${{ github.event.inputs.cibw_skip }} CIBW_ARCHS: "${{ matrix.arch }}" - # increase pip debugging output - CIBW_BUILD_VERBOSITY: 1 - run: ls -lh wheelhouse shell: bash diff --git a/.gitignore b/.gitignore index 0e609af..358519b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.whl *.tar.gz +.*.swp diff --git a/CMakeLists.txt b/CMakeLists.txt index 08b4674..8c9e512 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,9 @@ include(FetchContent) FetchContent_Declare( gemmi GIT_REPOSITORY https://github.com/project-gemmi/gemmi.git - GIT_TAG 28b5670ec176c6df7dbb765aab0a1c12698a5d23 # v0.6.3 + GIT_TAG v0.6.4 + #GIT_TAG master + GIT_SHALLOW TRUE ) # We don't want to install all gemmi files. diff --git a/README.md b/README.md index 894df7f..0d03136 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ because, unlike the module, it does not depend on Python version. * 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 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 b1f9200..82e8256 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,10 @@ [build-system] -requires = ["scikit-build-core==0.5.0"] +requires = ["scikit-build-core==0.7.0"] build-backend = "scikit_build_core.build" [project] name = "gemmi-program" -version = "0.6.3" +version = "0.6.4" requires-python = ">=3.8" description="gemmi (program executable only)" readme = "README.md" @@ -23,3 +23,7 @@ wheel.py-api = "py2.py3" # python version is irrelevant wheel.expand-macos-universal-tags = true # not sure about this one cmake.build-type = "Release" #logging.level = "DEBUG" + +[tool.cibuildwheel] +build-verbosity = 1 +test-command = "gemmi --version --verbose"