Skip to content

chore: update default Python version to 3.10 #712

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

Merged
jansegre merged 1 commit into from
Jul 24, 2023
Merged

chore: update default Python version to 3.10 #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ jobs:
- '3.10'
- '3.11'
exclude:
# XXX: neither pypy-3.10 nor pypy-3.11 exist yet, maybe pypy-3.10 will be out on PyPy v7.3.10
- python-impl: pypy
python-version: '3.10'
# XXX: pypy-3.11 does exist yet
- python-impl: pypy
python-version: '3.11'
steps:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# before changing these variables, make sure the tag $PYTHON-alpine$ALPINE exists first
# list of valid tags hese: https://hub.docker.com/_/python
ARG PYTHON=3.9
ARG PYTHON=3.10
ARG DEBIAN=bullseye

# stage-0: copy pyproject.toml/poetry.lock and install the production set of dependencies
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.pypy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# before changing these variables, make sure the tag $PYTHON-alpine$ALPINE exists first
# list of valid tags hese: https://hub.docker.com/_/pypy
ARG PYTHON=3.9
ARG PYTHON=3.10
ARG DEBIAN=bullseye

# stage-0: copy pyproject.toml/poetry.lock and install the production set of dependencies
Expand Down
20 changes: 10 additions & 10 deletions extras/github/test_docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def test_nightly_build_no_github_secret(self):
'GITHUB_EVENT_DEFAULT_BRANCH': 'master',
'GITHUB_EVENT_NUMBER': '',
'MATRIX_PYTHON_IMPL': 'python',
'MATRIX_PYTHON_VERSION': '3.9',
'MATRIX_PYTHON_VERSION': '3.10',
'SECRETS_DOCKERHUB_IMAGE': '',
'SECRETS_GHCR_IMAGE': '',
})
Expand All @@ -32,7 +32,7 @@ def test_nightly_build_no_github_secret(self):
output = prep_tags(os.environ, base_version, is_release_candidate)

self.assertEqual(output['slack-notification-version'], base_version)
self.assertEqual(output['version'], base_version + '-python3.9')
self.assertEqual(output['version'], base_version + '-python3.10')
self.assertEqual(output['login-dockerhub'], 'false')
self.assertEqual(output['login-ghcr'], 'false')
self.assertEqual(output['tags'], 'dont-push--local-only')
Expand All @@ -47,7 +47,7 @@ def test_nightly_build(self):
'GITHUB_EVENT_DEFAULT_BRANCH': 'master',
'GITHUB_EVENT_NUMBER': '',
'MATRIX_PYTHON_IMPL': 'python',
'MATRIX_PYTHON_VERSION': '3.9',
'MATRIX_PYTHON_VERSION': '3.10',
'SECRETS_DOCKERHUB_IMAGE': 'mock_image',
'SECRETS_GHCR_IMAGE': '',
})
Expand All @@ -62,12 +62,12 @@ def test_nightly_build(self):
output = prep_tags(os.environ, base_version, is_release_candidate)

self.assertEqual(output['slack-notification-version'], base_version)
self.assertEqual(output['version'], base_version + '-python3.9')
self.assertEqual(output['version'], base_version + '-python3.10')
self.assertEqual(output['login-dockerhub'], 'true')
self.assertEqual(output['login-ghcr'], 'false')
self.assertEqual(len(output['tags'].split(',')), 2)
self.assertIn('mock_image:nightly-55629a7d', output['tags'].split(','))
self.assertIn('mock_image:nightly-55629a7d-python3.9', output['tags'].split(','))
self.assertIn('mock_image:nightly-55629a7d-python3.10', output['tags'].split(','))
self.assertEqual(output['push'], 'true')
self.assertEqual(output['dockerfile'], 'Dockerfile')

Expand Down Expand Up @@ -110,7 +110,7 @@ def test_release_candidate_default_python(self):
'GITHUB_EVENT_DEFAULT_BRANCH': 'master',
'GITHUB_EVENT_NUMBER': '',
'MATRIX_PYTHON_IMPL': 'python',
'MATRIX_PYTHON_VERSION': '3.9',
'MATRIX_PYTHON_VERSION': '3.10',
'SECRETS_DOCKERHUB_IMAGE': 'mock_image',
'SECRETS_GHCR_IMAGE': '',
})
Expand Down Expand Up @@ -140,7 +140,7 @@ def test_release_default_python(self):
'GITHUB_EVENT_DEFAULT_BRANCH': 'master',
'GITHUB_EVENT_NUMBER': '',
'MATRIX_PYTHON_IMPL': 'python',
'MATRIX_PYTHON_VERSION': '3.9',
'MATRIX_PYTHON_VERSION': '3.10',
'SECRETS_DOCKERHUB_IMAGE': 'mock_image',
'SECRETS_GHCR_IMAGE': '',
})
Expand All @@ -155,12 +155,12 @@ def test_release_default_python(self):
output = prep_tags(os.environ, base_version, is_release_candidate)

self.assertEqual(output['slack-notification-version'], base_version)
self.assertEqual(output['version'], base_version + '-python3.9')
self.assertEqual(output['version'], base_version + '-python3.10')
self.assertEqual(output['login-dockerhub'], 'true')
self.assertEqual(output['login-ghcr'], 'false')
self.assertEqual(len(output['tags'].split(',')), 4)
self.assertIn('mock_image:v0.53-python3.9', output['tags'].split(','))
self.assertIn('mock_image:v0.53.0-python3.9', output['tags'].split(','))
self.assertIn('mock_image:v0.53-python3.10', output['tags'].split(','))
self.assertIn('mock_image:v0.53.0-python3.10', output['tags'].split(','))
self.assertIn('mock_image:v0.53.0', output['tags'].split(','))
self.assertIn('mock_image:latest', output['tags'].split(','))
self.assertEqual(output['push'], 'true')
Expand Down
Loading