Skip to content

Commit

Permalink
[pypi] various
Browse files Browse the repository at this point in the history
  • Loading branch information
fradav committed Jun 7, 2024
1 parent da5c4cc commit 2de2c9f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ jobs:
asset_content_type: application/octet-stream
if: matrix.os == 'windows-latest'
- name: Build wheels
uses: pypa/cibuildwheel@v2.18.0
uses: pypa/cibuildwheel@v2.18.1
- uses: actions/upload-artifact@v2
with:
path: ./wheelhouse/*.whl
Expand Down Expand Up @@ -231,7 +231,7 @@ jobs:
name: artifact
path: dist

- uses: pypa/gh-action-pypi-publish@master
- uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.pypi_password }}
Expand Down
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,9 @@ if(PYABCRANGER)
set(PYBIND11PKG pybind11)
endif()

# Get VCPKG revision from env
set(VCPKG_REVISION $ENV{VCPKG_REVISION})

pmm(
VCPKG
REVISION ${VCPKG_REVISION}
REVISION 2024.04.26
TRIPLET ${VCPKG_TARGET_TRIPLET}
REQUIRES range-v3 catch2 cxxopts fmt eigen3 ${PYBIND11PKG} ${TBBPKG} ${BOOSTREPKG} ${TESTDEPS}
)
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ manylinux-x86_64-image = "manylinux2014"
skip = "cp27-* cp35-* cp36-* cp37-* pp* *-musllinux* *-manylinux_i686 *-win32"
test-command = "pytest {project}/test/test-pyabcranger.py -v"
test-requires = ["pytest", "h5py"]
test-skip = "cp38-macosx_*:arm64"
build-verbosity = 3

[tool.cibuildwheel.linux]
before-all = "bash presetup.sh"
environment-pass = [ "VCPKG_REVISION" ]
before-build = "rm -f {project}/build/CMakeCache.txt"

[tool.cibuildwheel.macos]
Expand Down

0 comments on commit 2de2c9f

Please sign in to comment.