Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xavier Thompson
slapos.buildout
Commits
4f56b013
Commit
4f56b013
authored
Nov 25, 2021
by
Godefroid Chapelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Problem: Python 3.10 not tested on CI
Solution: add jobs to GH actions and to CircleCI
parent
846312c0
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
27 additions
and
11 deletions
+27
-11
.circleci/config.yml
.circleci/config.yml
+2
-2
.github/workflows/centos.yml
.github/workflows/centos.yml
+1
-1
.github/workflows/debian-sys.yml
.github/workflows/debian-sys.yml
+1
-1
.github/workflows/debian.yml
.github/workflows/debian.yml
+1
-1
.github/workflows/python-runners.yml
.github/workflows/python-runners.yml
+1
-1
.github/workflows/scripts-3.10.cfg
.github/workflows/scripts-3.10.cfg
+1
-0
.github/workflows/scripts.yml
.github/workflows/scripts.yml
+1
-1
Makefile
Makefile
+11
-2
Makefile.configure.Darwin
Makefile.configure.Darwin
+6
-0
src/zc/buildout/tests/test_all.py
src/zc/buildout/tests/test_all.py
+2
-2
No files found.
.circleci/config.yml
View file @
4f56b013
...
@@ -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
:
...
...
.github/workflows/centos.yml
View file @
4f56b013
...
@@ -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
...
...
.github/workflows/debian-sys.yml
View file @
4f56b013
...
@@ -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
...
...
.github/workflows/debian.yml
View file @
4f56b013
...
@@ -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
...
...
.github/workflows/python-runners.yml
View file @
4f56b013
...
@@ -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
...
...
.github/workflows/scripts-3.10.cfg
0 → 120000
View file @
4f56b013
scripts.cfg
\ No newline at end of file
.github/workflows/scripts.yml
View file @
4f56b013
...
@@ -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
:
...
...
Makefile
View file @
4f56b013
...
@@ -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}
.
...
...
Makefile.configure.Darwin
View file @
4f56b013
...
@@ -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
src/zc/buildout/tests/test_all.py
View file @
4f56b013
...
@@ -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
"""
"""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment