Commit 4f56b013 authored by Godefroid Chapelle's avatar Godefroid Chapelle

Problem: Python 3.10 not tested on CI

Solution: add jobs to GH actions and to CircleCI
parent 846312c0
...@@ -65,7 +65,7 @@ workflows: ...@@ -65,7 +65,7 @@ workflows:
- test: - test:
matrix: matrix:
parameters: parameters:
python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"] python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
build-type: ["centos_containers", "debian_containers"] build-type: ["centos_containers", "debian_containers"]
tests-sys-debian: tests-sys-debian:
jobs: jobs:
...@@ -79,7 +79,7 @@ workflows: ...@@ -79,7 +79,7 @@ workflows:
- install-python-and-test-ubuntu: - install-python-and-test-ubuntu:
matrix: matrix:
parameters: parameters:
python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"] python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
tests-macos-machines: tests-macos-machines:
jobs: jobs:
- install-python-and-test-macos: - install-python-and-test-macos:
......
...@@ -9,7 +9,7 @@ jobs: ...@@ -9,7 +9,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9] python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
......
...@@ -9,7 +9,7 @@ jobs: ...@@ -9,7 +9,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
python-version: [3.9] python-version: ["3.9"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
......
...@@ -9,7 +9,7 @@ jobs: ...@@ -9,7 +9,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9] python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
......
...@@ -10,7 +10,7 @@ jobs: ...@@ -10,7 +10,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9] python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
exclude: exclude:
# excludes 2.7 on windows as chocolatey does not support it anymore # excludes 2.7 on windows as chocolatey does not support it anymore
- os: windows-latest - os: windows-latest
......
scripts.cfg
\ No newline at end of file
...@@ -9,7 +9,7 @@ jobs: ...@@ -9,7 +9,7 @@ jobs:
strategy: strategy:
max-parallel: 4 max-parallel: 4
matrix: matrix:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9] python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
package: [zest.releaser, pyspf] package: [zest.releaser, pyspf]
steps: steps:
......
...@@ -22,11 +22,14 @@ ifeq ($(PYTHON_VER),3.8) ...@@ -22,11 +22,14 @@ ifeq ($(PYTHON_VER),3.8)
PYTHON_MINOR ?= 3.8.12 PYTHON_MINOR ?= 3.8.12
endif endif
ifeq ($(PYTHON_VER),3.9) ifeq ($(PYTHON_VER),3.9)
PYTHON_MINOR ?= 3.9.7 PYTHON_MINOR ?= 3.9.9
endif endif
ifeq ($(PYTHON_VER),3.10) ifeq ($(PYTHON_VER),3.10)
PYTHON_MINOR ?= 3.10.0 PYTHON_MINOR ?= 3.10.0
PYTHON_ARCHIVE ?= Python-3.10.0rc2 endif
ifeq ($(PYTHON_VER),3.11)
PYTHON_MINOR ?= 3.11.0
PYTHON_ARCHIVE ?= Python-3.11.0a1
endif endif
ifndef PYTHON_MINOR ifndef PYTHON_MINOR
...@@ -114,6 +117,8 @@ all_pythons: ...@@ -114,6 +117,8 @@ all_pythons:
$(MAKE) PYTHON_VER=3.6 python $(MAKE) PYTHON_VER=3.6 python
$(MAKE) PYTHON_VER=3.7 python $(MAKE) PYTHON_VER=3.7 python
$(MAKE) PYTHON_VER=3.8 python $(MAKE) PYTHON_VER=3.8 python
$(MAKE) PYTHON_VER=3.9 python
$(MAKE) PYTHON_VER=3.10 python
all_coverage: all_coverage:
$(MAKE) PYTHON_VER=2.7 coverage $(MAKE) PYTHON_VER=2.7 coverage
...@@ -121,6 +126,8 @@ all_coverage: ...@@ -121,6 +126,8 @@ all_coverage:
$(MAKE) PYTHON_VER=3.6 coverage $(MAKE) PYTHON_VER=3.6 coverage
$(MAKE) PYTHON_VER=3.7 coverage $(MAKE) PYTHON_VER=3.7 coverage
$(MAKE) PYTHON_VER=3.8 coverage $(MAKE) PYTHON_VER=3.8 coverage
$(MAKE) PYTHON_VER=3.9 coverage
$(MAKE) PYTHON_VER=3.10 coverage
all_test: all_test:
$(MAKE) PYTHON_VER=2.7 test $(MAKE) PYTHON_VER=2.7 test
...@@ -128,6 +135,8 @@ all_test: ...@@ -128,6 +135,8 @@ all_test:
$(MAKE) PYTHON_VER=3.6 test $(MAKE) PYTHON_VER=3.6 test
$(MAKE) PYTHON_VER=3.7 test $(MAKE) PYTHON_VER=3.7 test
$(MAKE) PYTHON_VER=3.8 test $(MAKE) PYTHON_VER=3.8 test
$(MAKE) PYTHON_VER=3.9 test
$(MAKE) PYTHON_VER=3.10 test
docker: docker:
docker build -f .github/workflows/Dockerfile --tag centos_buildout:python${PYTHON_VER} --build-arg PYTHON_VER=${PYTHON_VER} . docker build -f .github/workflows/Dockerfile --tag centos_buildout:python${PYTHON_VER} --build-arg PYTHON_VER=${PYTHON_VER} .
......
...@@ -24,4 +24,10 @@ endif ...@@ -24,4 +24,10 @@ endif
ifeq ($(PYTHON_VER),3.9) ifeq ($(PYTHON_VER),3.9)
PYTHON_CONFIGURE_ARGS ?= --with-openssl=$(OPENSSL) PYTHON_CONFIGURE_ARGS ?= --with-openssl=$(OPENSSL)
endif endif
ifeq ($(PYTHON_VER),3.10)
PYTHON_CONFIGURE_ARGS ?= --with-openssl=$(OPENSSL)
endif
ifeq ($(PYTHON_VER),3.11)
PYTHON_CONFIGURE_ARGS ?= --with-openssl=$(OPENSSL)
endif
...@@ -2071,8 +2071,8 @@ if sys.version_info > (2, 4): ...@@ -2071,8 +2071,8 @@ if sys.version_info > (2, 4):
Traceback (most recent call last): Traceback (most recent call last):
... ...
x y x y
^ ...^...
SyntaxError: invalid syntax SyntaxError...
<BLANKLINE> <BLANKLINE>
Exit: True Exit: True
""" """
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment