diff --git a/.github/actions/pydpkg/action.yml b/.github/actions/pydpkg/action.yml index d561f5ced..e1552cee2 100644 --- a/.github/actions/pydpkg/action.yml +++ b/.github/actions/pydpkg/action.yml @@ -1,6 +1,6 @@ inputs: workaround: - default: false + default: "" required: true path: default: "debian" @@ -34,7 +34,7 @@ runs: chmod --changes +x ${{ inputs.path }}/gunicorn-21.2.0/debian/control ls -l ${{ inputs.path }}/gunicorn-21.2.0/ - name: prepare deb source dir (${{ inputs.path }}) - if: ${{ inputs.workaround }} + if: ${{ inputs.workaround != "" }} shell: bash run: | echo 'extend-diff-ignore = "^setup\.cfg$"' >> ${{ inputs.path }}/gunicorn-21.2.0/debian/source/options diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index a5fa59ffd..102609015 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -46,13 +46,13 @@ jobs: uses: ./source/.github/actions/pydpkg with: path: debian-workaround - workaround: true + workaround: "all" - name: "Build dpkg package (default)" uses: ./source/.github/actions/pydpkg continue-on-error: true with: path: debian - workaround: false + workaround: "" - uses: actions/upload-artifact@v4 with: path: | diff --git a/MANIFEST.in b/MANIFEST.in index edf1811ef..f46537d59 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,10 +1,7 @@ -include .gitignore include LICENSE include NOTICE include README.rst include THANKS -include requirements_dev.txt -include requirements_test.txt recursive-include tests * recursive-include examples * recursive-include docs * diff --git a/Makefile b/Makefile index 5624704c5..51847da1f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ build: virtualenv venv - venv/bin/pip install -e . - venv/bin/pip install -r requirements_dev.txt + venv/bin/pip install -e .[dev,testing] test: venv/bin/python -m pytest diff --git a/README.md b/README.md index 41bdb577f..7cbf63203 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ details. ### CI -[![CI:buildpackage](https://github.com/pajod/gunicorn/actions/workflows/buildpackage.yml/badge.svg)](https://github.com/pajod/gunicorn/actions/workflows/buildpackage.yml) +[![CI:packaging](https://github.com/pajod/gunicorn/actions/workflows/packaging.yml/badge.svg)](https://github.com/pajod/gunicorn/actions/workflows/packaging.yml) [![CI:CodeQL](https://github.com/pajod/gunicorn/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/pajod/gunicorn/actions/workflows/github-code-scanning/codeql) [![CI:lint](https://github.com/pajod/gunicorn/actions/workflows/lint.yml/badge.svg)](https://github.com/pajod/gunicorn/actions/workflows/lint.yml) [![CI:tox](https://github.com/pajod/gunicorn/actions/workflows/tox.yml/badge.svg)](https://github.com/pajod/gunicorn/actions/workflows/tox.yml) diff --git a/pyproject.toml b/pyproject.toml index 3901e3fe0..701978b49 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -107,6 +107,15 @@ testing = [ # pytest 7.2.0 starts using Python 3.11 stdlib tomllib "pytest>=7.2.0", ] +dev = [ + # setuptools v68.0 fails hard on invalid pyproject.toml + # which a developer would want to know + # otherwise, oldest known-working version is 61.2 + "setuptools>=68.0", + "sphinx", + "sphinx_rtd_theme", +] + [project.scripts] # duplicates "python -m gunicorn" handling in __main__.py diff --git a/requirements_dev.txt b/requirements_dev.txt deleted file mode 100644 index 1d8c01291..000000000 --- a/requirements_dev.txt +++ /dev/null @@ -1,9 +0,0 @@ --r requirements_test.txt - -# setuptools v68.0 fails hard on invalid pyproject.toml -# which a developer would want to know -# otherwise, oldest known-working version is 61.2 -setuptools>=68.0 - -sphinx -sphinx_rtd_theme diff --git a/requirements_test.txt b/requirements_test.txt deleted file mode 100644 index 9d0701969..000000000 --- a/requirements_test.txt +++ /dev/null @@ -1,8 +0,0 @@ -gevent -eventlet -coverage -# pytest 8.0 intends to drop Python 3.7 -# pytest 7.2.0 starts using Python 3.11 stdlib tomllib -pytest>=7.2.0 -# pytest 6.0 supports modern importlib, so we do not need pytest-cov to fixup sys.path -# pytest-cov