From 6eb938f3f52e096c01a03d51dc137148f2f45b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Cassiers?= Date: Tue, 15 Oct 2024 16:21:25 +0200 Subject: [PATCH] support newer python versions in CI, add cargo lock to sdist --- .github/workflows/publish.yml | 14 +++++++------- MANIFEST.in | 1 + setup.py | 10 +++++----- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b748417..b323ccd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,14 +11,14 @@ jobs: fail-fast: false matrix: include: -# - vers: aarch64 -# os: ubuntu-20.04 + # - vers: aarch64 + # os: ubuntu-20.04 - vers: auto64 os: ubuntu-20.04 -# - vers: arm64 -# os: macos-10.15 -# - vers: auto64 -# os: macos-10.15 + # - vers: arm64 + # os: macos-10.15 + # - vers: auto64 + # os: macos-10.15 - vers: auto64 os: windows-2019 @@ -44,7 +44,7 @@ jobs: platforms: all - name: wheels ${{ matrix.os }} ${{ matrix.vers }} - uses: pypa/cibuildwheel@v2.4.0 + uses: pypa/cibuildwheel@v2.21.3 env: CIBW_ENVIRONMENT_WINDOWS: CXXFLAGS='-I C:/Local/boost_1_74_0' CIBW_BEFORE_ALL_LINUX: "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y && yum install -y boost-devel" diff --git a/MANIFEST.in b/MANIFEST.in index 7c68298..c2af147 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,3 @@ include Cargo.toml +include Cargo.lock recursive-include src * diff --git a/setup.py b/setup.py index 4d4820e..8995c75 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ setup( name="straps", - version="0.1.2", + version="0.1.3", author="Gaƫtan Cassiers", author_email="gaetan.cassiers@uclouvain.be", description="Statistical Testing of RAndom Probing Security", @@ -36,11 +36,11 @@ "Programming Language :: Python :: 3", ], rust_extensions=[ - RustExtension("straps._straps_ext", binding=Binding.PyO3, debug=False) - ], + RustExtension("straps._straps_ext", binding=Binding.PyO3, debug=False) + ], packages=["straps"], # rust extensions are not zip safe, just like C-extensions. zip_safe=False, - python_requires='>=3.6', - install_requires=["joblib~=0.17", "matplotlib~=3.1", "numpy~=1.16", "tqdm~=4.51"], + python_requires=">=3.6", + install_requires=["joblib~=0.17", "matplotlib~=3.1", "numpy~=1.16", "tqdm~=4.51"], )