From 3b5050657fd869933564cbe4b0b6a06df5139ea6 Mon Sep 17 00:00:00 2001 From: Robert de Vries Date: Wed, 8 Jul 2026 14:39:24 +0200 Subject: [PATCH] Fix more review comments and remove requirements sub-directory. All information in requirements is now present in the pyproject.toml file. --- .github/workflows/python-app.yml | 12 +++++------- MANIFEST.in | 1 - Makefile | 4 ++-- requirements/docs.txt | 3 --- requirements/prod.txt | 1 - requirements/setup.txt | 1 - requirements/test.txt | 3 --- 7 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 requirements/docs.txt delete mode 100644 requirements/prod.txt delete mode 100644 requirements/setup.txt delete mode 100644 requirements/test.txt diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 7f03589..3e0c0f3 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -45,6 +45,8 @@ jobs: # without those features must still import wolfcrypt.random successfully. runs-on: ubuntu-latest + env: + USE_LOCAL_WOLFSSL: ${{ github.workspace }}/wolfssl-install steps: - uses: actions/checkout@v7 @@ -83,19 +85,15 @@ jobs: make make install - name: Install wolfcrypt-py against the local wolfSSL - env: - USE_LOCAL_WOLFSSL: ${{ github.workspace }}/wolfssl-install run: | uv venv - uv pip install -r requirements/test.txt + uv pip install pytest uv pip install -e . - name: Check absence of ML-KEM and ML-DSA support run: | uv run --no-sync python -c "from wolfcrypt._ffi import lib as _lib; assert _lib.ML_KEM_ENABLED == 0, 'ML-KEM should be disabled'" uv run --no-sync python -c "from wolfcrypt._ffi import lib as _lib; assert _lib.ML_DSA_ENABLED == 0, 'ML-DSA should be disabled'" - name: Import smoke (regression for INVALID_DEVID) - run: uv run python -c "from wolfcrypt.random import Random; Random()" + run: uv run --no-sync python -c "from wolfcrypt.random import Random; Random()" - name: Run tests - env: - USE_LOCAL_WOLFSSL: ${{ github.workspace }}/wolfssl-install - run: uv run pytest tests + run: uv run --no-sync pytest tests diff --git a/MANIFEST.in b/MANIFEST.in index 1f0595f..ad758eb 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,6 +7,5 @@ include windows/fips_ready/user_settings.h include windows/non_fips/user_settings.h recursive-include tests * -recursive-include requirements * recursive-include docs *.rst conf.py Makefile diff --git a/Makefile b/Makefile index 4a9e8a4..9379dc5 100644 --- a/Makefile +++ b/Makefile @@ -84,8 +84,8 @@ servedocs: docs ## compile the docs watching for changes watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D . dist: clean ## builds source and wheel package - python setup.py sdist - + uv build --sdist + ./make/osx/build_wheels.sh ./make/manylinux1/build_wheels.sh diff --git a/requirements/docs.txt b/requirements/docs.txt deleted file mode 100644 index 7554dd3..0000000 --- a/requirements/docs.txt +++ /dev/null @@ -1,3 +0,0 @@ --r prod.txt -sphinx>=7 -sphinx-rtd-theme>=2 diff --git a/requirements/prod.txt b/requirements/prod.txt deleted file mode 100644 index babffd6..0000000 --- a/requirements/prod.txt +++ /dev/null @@ -1 +0,0 @@ -cffi>=1.17 diff --git a/requirements/setup.txt b/requirements/setup.txt deleted file mode 100644 index ca0c6f8..0000000 --- a/requirements/setup.txt +++ /dev/null @@ -1 +0,0 @@ --r prod.txt diff --git a/requirements/test.txt b/requirements/test.txt deleted file mode 100644 index 9d782d0..0000000 --- a/requirements/test.txt +++ /dev/null @@ -1,3 +0,0 @@ --r prod.txt -pytest>=8 -types-cffi>=1.17