Skip to content

Commit

Permalink
parent dc4f649
Browse files Browse the repository at this point in the history
author Christian Theune <ct@flyingcircus.io> 1621585346 +0200
committer Eli Kogan-Wang <elikowa@gmail.com> 1694227372 +0200

Try enabling Python 3.10 support in github actions / tox

Pin setuptools versions for development

tox/pytest are running into this issue:
pypa/setuptools#2632

We need a newer setuptools to fix a Python 3.10 issue.

bump (transitive) six dependency to force Python 3.10 compatibility

Grrr. Keep poking tox to pick up my Python 3.10 locally properly.

Update tox.ini

Co-authored-by: Jürgen Gmach <juergen.gmach@googlemail.com>

update lock files

enable python 3.11, too. fix test with changed output

update dev dependency

update dev dependencies, hopefully to fix 3.11

update appenv to include setuptools pinning
  • Loading branch information
ctheune authored and elikoga committed Sep 9, 2023
1 parent dc4f649 commit f06d4ed
Show file tree
Hide file tree
Showing 23 changed files with 114 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Expand Up @@ -40,7 +40,7 @@ jobs:
build:
strategy:
matrix:
python-version: [ '3.7', '3.8', '3.9' ]
python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]

# The type of runner that the job will run on
runs-on: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion appenv.py
Expand Up @@ -488,7 +488,7 @@ def update_lockfile(self, args=None, remaining=None):

extra_specs = []
result = cmd(
"{tmpdir}/bin/python -m pip freeze".format(tmpdir=tmpdir),
"{tmpdir}/bin/python -m pip freeze --all".format(tmpdir=tmpdir),
merge_stderr=False,
).decode("ascii")
pinned_versions = {}
Expand Down
9 changes: 6 additions & 3 deletions examples/api/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
9 changes: 6 additions & 3 deletions examples/django/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
9 changes: 6 additions & 3 deletions examples/errors/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
9 changes: 6 additions & 3 deletions examples/errors2/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
9 changes: 6 additions & 3 deletions examples/ignores/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
9 changes: 6 additions & 3 deletions examples/largetempl/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
9 changes: 6 additions & 3 deletions examples/package/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
9 changes: 6 additions & 3 deletions examples/sync_async/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
9 changes: 6 additions & 3 deletions examples/tutorial-buildout/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
9 changes: 6 additions & 3 deletions examples/tutorial-component/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
9 changes: 6 additions & 3 deletions examples/tutorial-helloworld/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
9 changes: 6 additions & 3 deletions examples/tutorial-parallelize/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
7 changes: 4 additions & 3 deletions examples/tutorial-provision-container/requirements.lock
Expand Up @@ -3,14 +3,15 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
11 changes: 7 additions & 4 deletions examples/tutorial-secrets/requirements.lock
@@ -1,17 +1,20 @@
# appenv-requirements-hash: a12a4aceadd6cbfbc0c654d8540fe14587d0fee8084431a7fe37a5ca9cea5260
-e ../../
ConfigUpdater==3.1
ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2021.10.8
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==21.3.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
setuptools==59.6.0
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.8
urllib3==1.26.13
zipp==3.6.0
7 changes: 4 additions & 3 deletions examples/vagrant-multi/requirements.lock
Expand Up @@ -4,14 +4,15 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
7 changes: 4 additions & 3 deletions examples/vagrant/requirements.lock
Expand Up @@ -4,14 +4,15 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
six==1.16.0
typing_extensions==4.1.1
urllib3==1.26.11
urllib3==1.26.13
zipp==3.6.0
11 changes: 7 additions & 4 deletions examples/venvs/requirements.lock
Expand Up @@ -4,14 +4,17 @@ ConfigUpdater==3.1.1
Jinja2==3.0.1
MarkupSafe==2.0.1
PyYAML==6.0
certifi==2022.6.15
certifi==2022.12.7
charset-normalizer==2.0.12
execnet==1.9.0
idna==3.3
idna==3.4
importlib-metadata==4.8.3
pip==18.1
py==1.11.0
remote-pdb==2.1.0
requests==2.27.1
typing_extensions==4.1.1
urllib3==1.26.11
setuptools==59.6.0
six==1.16.0
typing-extensions==4.1.1
urllib3==1.26.13
zipp==3.6.0
7 changes: 4 additions & 3 deletions requirements-dev.txt
Expand Up @@ -8,12 +8,13 @@ nodeenv==1.5.0
packaging==20.4
pluggy==0.13.1
pre-commit==2.15.0
py==1.10.0
py==1.11.0
pyparsing==2.4.7
PyYAML==5.3.1
six==1.15.0
PyYAML==5.4
six==1.16.0
toml==0.10.2
tox==3.20.1
virtualenv==20.1.0
sphinx==4.0.2
recommonmark==0.7.1
setuptools==56.2

0 comments on commit f06d4ed

Please sign in to comment.