Skip to content

Commit

Permalink
Merge pull request #1010 from HathorNetwork/chore/update-default-python
Browse files Browse the repository at this point in the history 
chore(ci): update default Python version used on docker images
  • Loading branch information
@jansegre
jansegre authored Aug 20, 2024
2 parents 7f03142 + 25a8abd commit 411fb65
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
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.10
ARG PYTHON=3.11
ARG DEBIAN=bullseye

# stage-0: copy pyproject.toml/poetry.lock and install the production set of dependencies
Expand Down
26 changes: 15 additions & 11 deletions extras/github/test_docker.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

from extras.github.docker import prep_base_version, prep_tags

DEFAULT_PYTHON_VERSION = '3.11'
NON_DEFAULT_PYTHON_VERSION = '3.10'


class DockerWorkflowTest(unittest.TestCase):
def setUp(self):
os.environ.update({
Expand All @@ -17,7 +21,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.10',
'MATRIX_PYTHON_VERSION': DEFAULT_PYTHON_VERSION,
'SECRETS_DOCKERHUB_IMAGE': '',
'SECRETS_GHCR_IMAGE': '',
})
Expand All @@ -32,7 +36,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.10')
self.assertEqual(output['version'], base_version + f'-python{DEFAULT_PYTHON_VERSION}')
self.assertEqual(output['login-dockerhub'], 'false')
self.assertEqual(output['login-ghcr'], 'false')
self.assertEqual(output['tags'], 'dont-push--local-only')
Expand All @@ -47,7 +51,7 @@ def test_nightly_build(self):
'GITHUB_EVENT_DEFAULT_BRANCH': 'master',
'GITHUB_EVENT_NUMBER': '',
'MATRIX_PYTHON_IMPL': 'python',
'MATRIX_PYTHON_VERSION': '3.10',
'MATRIX_PYTHON_VERSION': DEFAULT_PYTHON_VERSION,
'SECRETS_DOCKERHUB_IMAGE': 'mock_image',
'SECRETS_GHCR_IMAGE': '',
})
Expand All @@ -62,12 +66,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.10')
self.assertEqual(output['version'], base_version + f'-python{DEFAULT_PYTHON_VERSION}')
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.10', output['tags'].split(','))
self.assertIn(f'mock_image:nightly-55629a7d-python{DEFAULT_PYTHON_VERSION}', output['tags'].split(','))
self.assertEqual(output['push'], 'true')
self.assertEqual(output['dockerfile'], 'Dockerfile')

Expand All @@ -80,7 +84,7 @@ def test_release_candidate_non_default_python(self):
'GITHUB_EVENT_DEFAULT_BRANCH': 'master',
'GITHUB_EVENT_NUMBER': '',
'MATRIX_PYTHON_IMPL': 'python',
'MATRIX_PYTHON_VERSION': '3.11',
'MATRIX_PYTHON_VERSION': NON_DEFAULT_PYTHON_VERSION,
'SECRETS_DOCKERHUB_IMAGE': 'mock_image',
'SECRETS_GHCR_IMAGE': '',
})
Expand Down Expand Up @@ -110,7 +114,7 @@ def test_release_candidate_default_python(self):
'GITHUB_EVENT_DEFAULT_BRANCH': 'master',
'GITHUB_EVENT_NUMBER': '',
'MATRIX_PYTHON_IMPL': 'python',
'MATRIX_PYTHON_VERSION': '3.10',
'MATRIX_PYTHON_VERSION': DEFAULT_PYTHON_VERSION,
'SECRETS_DOCKERHUB_IMAGE': 'mock_image',
'SECRETS_GHCR_IMAGE': '',
})
Expand Down Expand Up @@ -140,7 +144,7 @@ def test_release_default_python(self):
'GITHUB_EVENT_DEFAULT_BRANCH': 'master',
'GITHUB_EVENT_NUMBER': '',
'MATRIX_PYTHON_IMPL': 'python',
'MATRIX_PYTHON_VERSION': '3.10',
'MATRIX_PYTHON_VERSION': DEFAULT_PYTHON_VERSION,
'SECRETS_DOCKERHUB_IMAGE': 'mock_image',
'SECRETS_GHCR_IMAGE': '',
})
Expand All @@ -155,12 +159,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.10')
self.assertEqual(output['version'], base_version + f'-python{DEFAULT_PYTHON_VERSION}')
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.10', output['tags'].split(','))
self.assertIn('mock_image:v0.53.0-python3.10', output['tags'].split(','))
self.assertIn(f'mock_image:v0.53-python{DEFAULT_PYTHON_VERSION}', output['tags'].split(','))
self.assertIn(f'mock_image:v0.53.0-python{DEFAULT_PYTHON_VERSION}', 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

0 comments on commit 411fb65

Please sign in to comment.