Skip to content

Commit

Permalink
Set Python 3.9 as default and update requirements. (#58)
Browse files Browse the repository at this point in the history
* Make Python 3.9 the default Python.
* Use sanity requirements only for default Python.
* Update requirements.
* Freeze requirements.
  • Loading branch information
mattclay committed Apr 22, 2021
1 parent 278cf86 commit 015ba65
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 58 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ RUN locale-gen en_US.UTF-8
VOLUME /sys/fs/cgroup /run/lock /run /tmp

RUN ln -s python2.7 /usr/bin/python2
RUN ln -s python3.6 /usr/bin/python3 -f
RUN ln -s python3.9 /usr/bin/python3 -f
RUN ln -s python3 /usr/bin/python

# Install pwsh, and other PS/.NET sanity test tools.
Expand Down Expand Up @@ -96,7 +96,7 @@ COPY freeze/*.txt /tmp/freeze/
RUN /tmp/requirements.sh 2.6
RUN /tmp/requirements.sh 2.7
RUN /tmp/requirements.sh 3.5
RUN /tmp/requirements.sh 3.6
RUN /tmp/requirements.sh 3.7
RUN /tmp/requirements.sh 3.8
RUN /tmp/requirements.sh 3.9
RUN /tmp/requirements.sh 3.6
4 changes: 2 additions & 2 deletions files/requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ else
done

for requirement in "${requirements[@]}"; do
# except for the import sanity test, all sanity tests require python 3.6+
# all sanity tests run using the default python, except for the import sanity test, which runs on all versions
if [[ "${requirement}" =~ ^sanity\. ]] && [[ "${requirement}" != "sanity.import.txt" ]]; then
if [[ "${python_version}" =~ ^2\. ]] || [[ "${python_version}" == "3.5" ]]; then
if [[ "${python_version}" != '3.9' ]]; then
continue
fi
fi
Expand Down
4 changes: 2 additions & 2 deletions freeze/2.7.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apipkg==1.5
appdirs==1.4.4
atomicwrites==1.4.0
attrs==20.3.0
backports.functools-lru-cache==1.6.3
backports.functools-lru-cache==1.6.4
bcrypt==3.1.7
certifi==2020.12.5
cffi==1.14.5
Expand Down Expand Up @@ -53,7 +53,7 @@ singledispatch==3.6.1
six==1.15.0
typing==3.7.4.3
urllib3==1.26.4
virtualenv==20.4.3
virtualenv==20.4.4
wcwidth==0.2.5
xmltodict==0.12.0
zipp==1.2.0
19 changes: 2 additions & 17 deletions freeze/3.6.txt
Original file line number Diff line number Diff line change
@@ -1,41 +1,32 @@
antsibull-changelog==0.9.0
apipkg==1.5
astroid==2.4.2
attrs==20.3.0
bcrypt==3.2.0
certifi==2020.12.5
cffi==1.14.5
chardet==4.0.0
coverage==4.5.4
cryptography==3.3.2
docutils==0.16
execnet==1.8.0
idna==2.5
importlib-metadata==3.10.0
importlib-metadata==4.0.1
iniconfig==1.1.1
isort==5.7.0
Jinja2==2.11.3
junit-xml==1.9
lazy-object-proxy==1.4.3
MarkupSafe==1.1.1
mccabe==0.6.1
mock==4.0.3
ntlm-auth==1.5.0
packaging==20.9
paramiko==2.7.2
pathspec==0.8.1
pluggy==0.13.1
py==1.10.0
pyasn1==0.4.8
pycodestyle==2.6.0
pycparser==2.20
pylint==2.6.0
PyNaCl==1.4.0
pyOpenSSL==20.0.1
pyparsing==2.4.7
pypsrp==0.5.0
pyspnego==0.1.5
pytest==6.2.2
pytest==6.2.3
pytest-forked==1.3.0
pytest-mock==3.5.1
pytest-xdist==2.2.1
Expand All @@ -45,15 +36,9 @@ requests==2.25.1
requests-credssp==1.2.0
requests-ntlm==1.1.0
resolvelib==0.5.4
rstcheck==3.3.1
semantic-version==2.8.5
six==1.15.0
toml==0.10.2
typed-ast==1.4.2
typing-extensions==3.7.4.3
urllib3==1.26.4
voluptuous==0.12.1
wrapt==1.12.1
xmltodict==0.12.0
yamllint==1.26.0
zipp==3.4.1
19 changes: 2 additions & 17 deletions freeze/3.7.txt
Original file line number Diff line number Diff line change
@@ -1,41 +1,32 @@
antsibull-changelog==0.9.0
apipkg==1.5
astroid==2.4.2
attrs==20.3.0
bcrypt==3.2.0
certifi==2020.12.5
cffi==1.14.5
chardet==4.0.0
coverage==4.5.4
cryptography==3.3.2
docutils==0.16
execnet==1.8.0
idna==2.5
importlib-metadata==3.10.0
importlib-metadata==4.0.1
iniconfig==1.1.1
isort==5.7.0
Jinja2==2.11.3
junit-xml==1.9
lazy-object-proxy==1.4.3
MarkupSafe==1.1.1
mccabe==0.6.1
mock==4.0.3
ntlm-auth==1.5.0
packaging==20.9
paramiko==2.7.2
pathspec==0.8.1
pluggy==0.13.1
py==1.10.0
pyasn1==0.4.8
pycodestyle==2.6.0
pycparser==2.20
pylint==2.6.0
PyNaCl==1.4.0
pyOpenSSL==20.0.1
pyparsing==2.4.7
pypsrp==0.5.0
pyspnego==0.1.5
pytest==6.2.2
pytest==6.2.3
pytest-forked==1.3.0
pytest-mock==3.5.1
pytest-xdist==2.2.1
Expand All @@ -45,15 +36,9 @@ requests==2.25.1
requests-credssp==1.2.0
requests-ntlm==1.1.0
resolvelib==0.5.4
rstcheck==3.3.1
semantic-version==2.8.5
six==1.15.0
toml==0.10.2
typed-ast==1.4.2
typing-extensions==3.7.4.3
urllib3==1.26.4
voluptuous==0.12.1
wrapt==1.12.1
xmltodict==0.12.0
yamllint==1.26.0
zipp==3.4.1
17 changes: 1 addition & 16 deletions freeze/3.8.txt
Original file line number Diff line number Diff line change
@@ -1,40 +1,31 @@
antsibull-changelog==0.9.0
apipkg==1.5
astroid==2.4.2
attrs==20.3.0
bcrypt==3.2.0
certifi==2020.12.5
cffi==1.14.5
chardet==4.0.0
coverage==4.5.4
cryptography==3.3.2
docutils==0.16
execnet==1.8.0
idna==2.5
iniconfig==1.1.1
isort==5.7.0
Jinja2==2.11.3
junit-xml==1.9
lazy-object-proxy==1.4.3
MarkupSafe==1.1.1
mccabe==0.6.1
mock==4.0.3
ntlm-auth==1.5.0
packaging==20.9
paramiko==2.7.2
pathspec==0.8.1
pluggy==0.13.1
py==1.10.0
pyasn1==0.4.8
pycodestyle==2.6.0
pycparser==2.20
pylint==2.6.0
PyNaCl==1.4.0
pyOpenSSL==20.0.1
pyparsing==2.4.7
pypsrp==0.5.0
pyspnego==0.1.5
pytest==6.2.2
pytest==6.2.3
pytest-forked==1.3.0
pytest-mock==3.5.1
pytest-xdist==2.2.1
Expand All @@ -44,13 +35,7 @@ requests==2.25.1
requests-credssp==1.2.0
requests-ntlm==1.1.0
resolvelib==0.5.4
rstcheck==3.3.1
semantic-version==2.8.5
six==1.15.0
toml==0.10.2
typed-ast==1.4.2
urllib3==1.26.4
voluptuous==0.12.1
wrapt==1.12.1
xmltodict==0.12.0
yamllint==1.26.0
4 changes: 2 additions & 2 deletions freeze/3.9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cffi==1.14.5
chardet==4.0.0
coverage==4.5.4
cryptography==3.3.2
docutils==0.16
docutils==0.17.1
execnet==1.8.0
idna==2.5
iniconfig==1.1.1
Expand All @@ -34,7 +34,7 @@ pyOpenSSL==20.0.1
pyparsing==2.4.7
pypsrp==0.5.0
pyspnego==0.1.5
pytest==6.2.2
pytest==6.2.3
pytest-forked==1.3.0
pytest-mock==3.5.1
pytest-xdist==2.2.1
Expand Down
1 change: 1 addition & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ resolvelib >= 0.5.3, < 0.6.0 # keep in sync with `requirements.txt`
coverage >= 4.5.1, < 5.0.0 ; python_version < '3.7' # coverage 4.4 required for "disable_warnings" support but 4.5.1 needed for bug fixes, coverage 5.0+ incompatible
coverage >= 4.5.2, < 5.0.0 ; python_version == '3.7' # coverage 4.5.2 fixes bugs in support for python 3.7, coverage 5.0+ incompatible
coverage >= 4.5.4, < 5.0.0 ; python_version > '3.7' # coverage had a bug in < 4.5.4 that would cause unit tests to hang in Python 3.8, coverage 5.0+ incompatible
decorator < 5.0.0 ; python_version < '3.5' # decorator 5.0.5 and later require python 3.5 or later
six < 1.14.0 ; python_version < '2.7' # six 1.14.0 drops support for python 2.6
cryptography < 2.2 ; python_version < '2.7' # cryptography 2.2 drops support for python 2.6
cryptography < 3.4 ; python_version >= '2.7' # limit cryptography to the latest version ansible-test will accept
Expand Down

0 comments on commit 015ba65

Please sign in to comment.