diff options
| author | Paul Brown <paul90brown@gmail.com> | 2022-01-13 02:28:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 14:28:40 +0600 |
| commit | 1cb3f6e4514836a66d204411f50e3142632b9860 (patch) | |
| tree | 352711f111af926d36e77fd6b8de4be355957d75 | |
| parent | b8b0cbb6114b19f23d40f5a8f985f393fadc2030 (diff) | |
| download | kombu-1cb3f6e4514836a66d204411f50e3142632b9860.tar.gz | |
Revert "try pining setuptools (#1466)" (#1481)
* Revert "try pining setuptools (#1466)"
This reverts commit 6ddf9409401e290e267c9c5041d92fdf5f47170d.
* Revert "try restrict setuptool in CI"
This reverts commit c4a8c2a69f0caad080984e466a5ccdb4be068373.
* require setuptools>=47.0.0 in pkgutils.txt (version that dropped py2 support)
| -rw-r--r-- | .github/workflows/ci.yaml | 6 | ||||
| -rw-r--r-- | requirements/pkgutils.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0c5fab6b..117496a8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,7 +18,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - run: pip install --upgrade pip 'setuptools<59.7.0' wheel tox tox-docker + run: pip install --upgrade pip setuptools wheel tox tox-docker - name: Run unittest run: tox -v -e ${{ matrix.python-version }}-linux-unit -- -v #################### Integration tests #################### @@ -47,7 +47,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - run: pip install --upgrade pip 'setuptools<59.7.0' wheel tox tox-docker + run: pip install --upgrade pip setuptools wheel tox tox-docker # Tox fails if a Python versions contains a hyphen, this changes "pypy-3.8" to "pypy3.8". - name: Determine Python version run: echo PYTHON_VERSION=$(echo ${{ matrix.python-version }} | sed s/-//) >> $GITHUB_ENV @@ -74,7 +74,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - run: pip install --upgrade pip 'setuptools<59.7.0' wheel tox tox-docker + run: pip install --upgrade pip setuptools wheel tox tox-docker - name: Run flake8 run: tox -v -e flake8 -- -v - name: Run pydocstyle diff --git a/requirements/pkgutils.txt b/requirements/pkgutils.txt index 8af47b45..088ad211 100644 --- a/requirements/pkgutils.txt +++ b/requirements/pkgutils.txt @@ -1,4 +1,4 @@ -setuptools>=59.1.1,<59.7.0 +setuptools>=47.0.0 wheel>=0.29.0 flake8>=2.5.4 tox>=2.3.1 |