Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Python 3.10 as default. #124

Merged
merged 3 commits into from
Oct 18, 2021
Merged

Update to Python 3.10 as default. #124

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f26ce7
Update requirements.
Oct 13, 2021
582c7e6
Update to Python 3.10 as default.
Oct 13, 2021
ab1dfc0
Update to newest bugfixed version.
Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions config/c-code/manylinux-install.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,19 @@ yum -y install libffi-devel

# Compile wheels
for PYBIN in /opt/python/*/bin; do
if [[ "${PYBIN}" == *"cp27"* ]] || \
if \
{% if with_legacy_python %}
[[ "${PYBIN}" == *"cp27"* ]] || \
[[ "${PYBIN}" == *"cp35"* ]] || \
[[ "${PYBIN}" == *"cp36"* ]] || \
[[ "${PYBIN}" == *"cp37"* ]] || \
[[ "${PYBIN}" == *"cp38"* ]] || \
{% endif %}
{% if with_future_python %}
[[ "${PYBIN}" == *"cp310"* ]] || \
[[ "${PYBIN}" == *"cp311"* ]] || \
{% endif %}
[[ "${PYBIN}" == *"cp39"* ]]; then
[[ "${PYBIN}" == *"cp37"* ]] || \
[[ "${PYBIN}" == *"cp38"* ]] || \
[[ "${PYBIN}" == *"cp39"* ]] || \
[[ "${PYBIN}" == *"cp310"* ]] ; then
"${PYBIN}/pip" install -e /io/
"${PYBIN}/pip" wheel /io/ -w wheelhouse/
if [ `uname -m` == 'aarch64' ]; then
Expand Down
7 changes: 4 additions & 3 deletions config/c-code/tests-strategy.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
{% if with_legacy_python %}
- 2.7
- 3.5
- 3.6
{% endif %}
{% if with_pypy and with_legacy_python %}
- pypy-2.7
{% endif %}
{% if with_pypy %}
- pypy-3.6
- pypy-3.7
{% endif %}
- 3.6
- 3.7
- 3.8
- 3.9
- 3.10
{% if with_future_python %}
- 3.10.0-rc.2
- 3.11.0-alpha.1
{% endif %}
os: [ubuntu-20.04, macos-latest]
{% if with_pypy or with_legacy_python %}
Expand Down
5 changes: 3 additions & 2 deletions config/c-code/tox.ini.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ envlist =
{% if with_legacy_python %}
py27,py27-pure
py35,py35-pure
{% endif %}
py36,py36-pure
{% endif %}
py37,py37-pure
py38,py38-pure
py39,py39-pure
{% if with_future_python %}
py310,py310-pure
{% if with_future_python %}
py311,py311-pure
{% endif %}
{% if with_pypy and with_legacy_python %}
pypy
Expand Down
8 changes: 5 additions & 3 deletions config/default/appveyor.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,22 @@ environment:
- python: 27-x64
- python: 35
- python: 35-x64
{% endif %}
- python: 36
- python: 36-x64
{% endif %}
- python: 37
- python: 37-x64
- python: 38
- python: 38-x64
- python: 39
- python: 39-x64
- python: 310
- python: 310-x64
{% if with_future_python %}
# `multibuild` cannot install non-final versions as they are not on
# ftp.python.org, so we skip Python 3.10 until its final release:
# - python: 310
# - python: 310-x64
# - python: 311
# - python: 311-x64
{% endif %}
{% for line in additional_matrix %}
%(line)s
Expand Down
11 changes: 6 additions & 5 deletions config/default/tests.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@ jobs:
{% if with_legacy_python %}
- ["2.7", "py27"]
- ["3.5", "py35"]
{% endif %}
- ["3.6", "py36"]
{% endif %}
- ["3.7", "py37"]
- ["3.8", "py38"]
- ["3.9", "py39"]
- ["3.10", "py310"]
{% if with_future_python %}
- ["3.10.0-rc.2", "py310"]
- ["3.11.0-alpha.1", "py311"]
{% endif %}
{% if with_pypy and with_legacy_python %}
- ["pypy2", "pypy"]
Expand All @@ -54,11 +55,11 @@ jobs:
{% endfor %}
{% if with_windows %}
exclude:
- { os: windows, config: ["3.8", "lint"] }
- { os: windows, config: ["3.9", "lint"] }
{% if with_docs %}
- { os: windows, config: ["3.8", "docs"] }
- { os: windows, config: ["3.9", "docs"] }
{% endif %}
- { os: windows, config: ["3.8", "coverage"] }
- { os: windows, config: ["3.9", "coverage"] }
{% endif %}

runs-on: ${{ matrix.os }}-latest
Expand Down
5 changes: 3 additions & 2 deletions config/default/tox-envlist.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ envlist =
{% if with_legacy_python %}
py27
py35
{% endif %}
py36
{% endif %}
py37
py38
py39
{% if with_future_python %}
py310
{% if with_future_python %}
py311
{% endif %}
{% if with_pypy and with_legacy_python %}
pypy
Expand Down
2 changes: 1 addition & 1 deletion config/default/tox-lint.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ deps =
flake8
{% endif %}
check-manifest
check-python-versions
check-python-versions >= 0.19
icemac marked this conversation as resolved.
Show resolved Hide resolved
wheel
commands =
{% if use_flake8 %}
Expand Down
8 changes: 4 additions & 4 deletions config/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jinja2 == 2.11.3
check-python-versions == 0.18.1
toml == 0.10.2
tox == 3.20.1
Jinja2==3.0.2
check-python-versions==0.19.0
icemac marked this conversation as resolved.
Show resolved Hide resolved
toml==0.10.2
tox==3.24.4