From 2ec7175c3bd4d024cc0739dba35bbc849fabd03b Mon Sep 17 00:00:00 2001 From: Romain Avouac <43444134+avouacr@users.noreply.github.com> Date: Fri, 17 Nov 2023 19:26:43 +0100 Subject: [PATCH] Bump patch versions for Python 3.10 and 3.11 (#158) * add .gitignore * bump python 3.10 and 3.11 --- .github/workflows/main-workflow.yml | 52 +++---- .github/workflows/pull-request-workflow.yml | 28 ++-- .gitignore | 162 ++++++++++++++++++++ python-minimal/Dockerfile | 2 +- 4 files changed, 203 insertions(+), 41 deletions(-) create mode 100644 .gitignore diff --git a/.github/workflows/main-workflow.yml b/.github/workflows/main-workflow.yml index e150e5f3..5bc3d28b 100644 --- a/.github/workflows/main-workflow.yml +++ b/.github/workflows/main-workflow.yml @@ -29,8 +29,8 @@ jobs: context: python-minimal test: true base_image: base - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} @@ -44,8 +44,8 @@ jobs: context: python-datascience test: true base_image: python-minimal - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} @@ -59,8 +59,8 @@ jobs: context: python-pytorch test: true base_image: python-minimal - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} @@ -74,8 +74,8 @@ jobs: context: python-tensorflow test: true base_image: python-minimal - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} @@ -119,8 +119,8 @@ jobs: context: jupyter test: true base_image: python-datascience - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} @@ -134,8 +134,8 @@ jobs: context: vscode test: true base_image: python-datascience - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} @@ -149,8 +149,8 @@ jobs: context: spark test: true base_image: python-minimal - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 spark_version: 3.5.0 branch: ${{ github.ref }} secrets: @@ -165,8 +165,8 @@ jobs: context: jupyter test: true base_image: pyspark - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 spark_version: 3.5.0 branch: ${{ github.ref }} secrets: @@ -181,8 +181,8 @@ jobs: context: vscode test: true base_image: pyspark - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 spark_version: 3.5.0 branch: ${{ github.ref }} secrets: @@ -197,8 +197,8 @@ jobs: context: jupyter test: true base_image: python-pytorch - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} @@ -212,8 +212,8 @@ jobs: context: vscode test: true base_image: python-pytorch - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} @@ -227,8 +227,8 @@ jobs: context: jupyter test: true base_image: python-tensorflow - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} @@ -242,8 +242,8 @@ jobs: context: vscode test: true base_image: python-tensorflow - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} diff --git a/.github/workflows/pull-request-workflow.yml b/.github/workflows/pull-request-workflow.yml index e61df911..845a4475 100644 --- a/.github/workflows/pull-request-workflow.yml +++ b/.github/workflows/pull-request-workflow.yml @@ -75,8 +75,8 @@ jobs: context: python-minimal test: true base_image: base - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} python-datascience: needs: changes @@ -87,8 +87,8 @@ jobs: context: python-datascience test: true base_image: python-minimal - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} python-pytorch: needs: changes @@ -99,8 +99,8 @@ jobs: context: python-pytorch test: true base_image: python-minimal - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} python-tensorflow: needs: changes @@ -111,8 +111,8 @@ jobs: context: python-tensorflow test: true base_image: python-minimal - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} r-minimal: needs: changes @@ -147,8 +147,8 @@ jobs: context: spark test: true base_image: python-minimal - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 spark_version: 3.5.0 branch: ${{ github.ref }} sparkr: @@ -184,8 +184,8 @@ jobs: context: jupyter test: true base_image: python-datascience - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} vscode-python: needs: changes @@ -196,8 +196,8 @@ jobs: context: vscode test: true base_image: python-datascience - python_version_1: 3.11.4 - python_version_2: 3.10.12 + python_version_1: 3.11.6 + python_version_2: 3.10.13 branch: ${{ github.ref }} rstudio: needs: changes diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..f9e73089 --- /dev/null +++ b/.gitignore @@ -0,0 +1,162 @@ +base/scripts/ + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ diff --git a/python-minimal/Dockerfile b/python-minimal/Dockerfile index 9ec0a32d..9bb79460 100644 --- a/python-minimal/Dockerfile +++ b/python-minimal/Dockerfile @@ -3,7 +3,7 @@ FROM $BASE_IMAGE LABEL maintainer="InseeFrLab " -ARG PYTHON_VERSION="3.11.4" +ARG PYTHON_VERSION="3.11.6" ENV PYTHON_VERSION=${PYTHON_VERSION} ENV MAMBA_DIR="/opt/mamba"