Skip to content

Commit

Permalink
Merge pull request #1178 from sys-bio/add-py312
Browse files Browse the repository at this point in the history
Add Python 3.12 and remove 3.8
  • Loading branch information
luciansmith committed Jan 29, 2024
2 parents 4d8807a + be3c5f9 commit 1ce4ee9
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 12 deletions.
22 changes: 11 additions & 11 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,6 @@ stages:
vmImage: 'macOS-11'
strategy:
matrix:
py38:
PythonVersion: 3.8
PythonName: py38
py39:
PythonVersion: 3.9
PythonName: py39
Expand All @@ -207,6 +204,9 @@ stages:
py311:
PythonVersion: 3.11
PythonName: py311
py312:
PythonVersion: 3.12
PythonName: py312
variables:
MinicondaRoot : '/usr/local/miniconda'
PythonRoot: '$(MinicondaRoot)/envs/$(PythonName)'
Expand Down Expand Up @@ -413,8 +413,8 @@ stages:
variables:
LLVM_CACHE: 'false'
MinicondaRoot : 'C:\Miniconda'
PythonName: 'py39'
PythonVersion: '3.9'
PythonName: 'py311'
PythonVersion: '3.11'
PythonRoot: '$(MinicondaRoot)\envs\$(PythonName)'
PythonLibDir: '$(PythonRoot)\Lib'
PythonScriptsDir: '$(PythonRoot)\Scripts'
Expand Down Expand Up @@ -557,9 +557,6 @@ stages:
vmImage: 'windows-2019'
strategy:
matrix:
py38:
PythonVersion: 3.8
PythonName: py38
py39:
PythonVersion: 3.9
PythonName: py39
Expand All @@ -569,6 +566,9 @@ stages:
py311:
PythonVersion: 3.11
PythonName: py311
py312:
PythonVersion: 3.12
PythonName: py312
variables:
MinicondaRoot : 'C:\Miniconda'
PythonRoot: '$(MinicondaRoot)\envs\$(PythonName)'
Expand Down Expand Up @@ -963,9 +963,6 @@ stages:
- job:
strategy:
matrix:
py38:
PythonVersion: 3.8
PythonName: py38
py39:
PythonVersion: 3.9
PythonName: py39
Expand All @@ -975,6 +972,9 @@ stages:
py311:
PythonVersion: 3.11
PythonName: py311
py312:
PythonVersion: 3.12
PythonName: py312
pool:
vmImage: 'ubuntu-20.04'
container: sysbiouw/roadrunner-manylinux2014:latest
Expand Down
22 changes: 22 additions & 0 deletions docker/INSTRUCTIONS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
When updating (i.e. when Python comes out with a new version):

* Change roadrunner-manylinux2014/Dockerfile to reflect new python versions.
* Make sure docker is running (launching it on the lab mac works)
* Don't actually use the GUI; just use the command line, once it's running.
* Run the following commands:

cd roadrunner/docker/
docker build roadrunner-manylinux2014
docker images

* Note the IMAGE ID of the thing you just built (We'll say it's 5555):

docker tag 5555 sysbiouw/roadrunner-manylinux2014
docker login -u "sysbiouw" docker.io
docker push sysbiouw/roadrunner-manylinux2014



If you need to update one of the other images, follow the same instructions, but build up from -base to -add-deps, depending on what needs to be updated. (i.e. if the deps need to be updated, do that first, then the Python with the one after that)

Make sure you build and push roadrunner-manylinux2014-base first, then roadrunner-manylinux2014-add-deps
2 changes: 1 addition & 1 deletion docker/roadrunner-manylinux2014/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ FROM sysbiouw/roadrunner-manylinux2014-add-deps
RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh
RUN bash Miniconda3-latest-Linux-x86_64.sh -b -p /Miniconda3

RUN /Miniconda3/bin/conda create -y --name py38 python=3.8 pytest
RUN /Miniconda3/bin/conda create -y --name py39 python=3.9 pytest
RUN /Miniconda3/bin/conda create -y --name py310 python=3.10 pytest
RUN /Miniconda3/bin/conda create -y --name py311 python=3.11 pytest -c conda-forge
RUN /Miniconda3/bin/conda create -y --name py312 python=3.12 pytest -c conda-forge

RUN /Miniconda3/bin/conda init && bash ~/.bashrc && . ~/.bashrc

0 comments on commit 1ce4ee9

Please sign in to comment.