Skip to content
Snippets Groups Projects
Commit 45524b5d authored by Colm Talbot's avatar Colm Talbot
Browse files

MAINT: drop py39 support

parent a20cd33b
No related branches found
No related tags found
1 merge request!1374MAINT: drop py39 support
Pipeline #650331 passed
......@@ -70,10 +70,6 @@ containers:
${script} --help;
done
basic-3.9:
<<: *test-python
image: python:3.9
basic-3.10:
<<: *test-python
image: python:3.10
......@@ -89,10 +85,6 @@ basic-3.11:
- *list-env
- pytest test/test_samplers_import.py -v
import-samplers-3.9:
<<: *test-samplers-import
image: containers.ligo.org/lscsoft/bilby/v2-bilby-python39
import-samplers-3.10:
<<: *test-samplers-import
image: containers.ligo.org/lscsoft/bilby/v2-bilby-python310
......@@ -138,11 +130,6 @@ install:
- pytest --cov=bilby --durations 10
python-3.9:
<<: *unit-test
needs: ["basic-3.9"]
image: containers.ligo.org/lscsoft/bilby/v2-bilby-python39
python-3.10:
<<: *unit-test
needs: ["basic-3.10", "precommits-py3.10"]
......@@ -172,11 +159,6 @@ python-3.11:
- *list-env
- pytest test/integration/sampler_run_test.py --durations 10 -v
python-3.9-samplers:
<<: *test-sampler
needs: ["basic-3.9"]
image: containers.ligo.org/lscsoft/bilby/v2-bilby-python39
python-3.10-samplers:
<<: *test-sampler
needs: ["basic-3.10", "precommits-py3.10"]
......@@ -208,11 +190,6 @@ integration-tests-python-3.10:
- *list-env
- pytest test/gw/plot_test.py
plotting-python-3.9:
<<: *plotting
image: containers.ligo.org/lscsoft/bilby/v2-bilby-python39
needs: ["basic-3.9"]
plotting-python-3.10:
<<: *plotting
image: containers.ligo.org/lscsoft/bilby/v2-bilby-python310
......@@ -280,11 +257,6 @@ pages:
- docker image tag v3-bilby-$PYVERSION containers.ligo.org/lscsoft/bilby/v2-bilby-$PYVERSION:latest
- docker image push containers.ligo.org/lscsoft/bilby/v2-bilby-$PYVERSION:latest
build-python39-container:
<<: *build-container
variables:
PYVERSION: "python39"
build-python310-container:
<<: *build-container
variables:
......
# This dockerfile is written automatically and should not be modified by hand.
FROM containers.ligo.org/docker/base:conda
LABEL name="bilby CI testing" \
maintainer="Gregory Ashton <gregory.ashton@ligo.org>, Colm Talbot <colm.talbot@ligo.org>"
COPY env-template.yml env.yml
RUN echo " - python=3.9" >> env.yml
ENV conda_env python39
RUN mamba env create -f env.yml -n ${conda_env}
RUN echo "source activate ${conda_env}" > ~/.bashrc
ENV PATH /opt/conda/envs/${conda_env}/bin:$PATH
RUN /bin/bash -c "source activate ${conda_env}"
RUN mamba info
RUN python --version
# Add the ROQ data to the image
RUN mkdir roq_basis \
&& cd roq_basis \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_linear.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_quadratic.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_linear.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_quadratic.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/params.dat \
&& wget https://git.ligo.org/soichiro.morisaki/roq_basis/raw/main/IMRPhenomD/16s_nospins/basis_addcal.hdf5 \
&& wget https://git.ligo.org/soichiro.morisaki/roq_basis/raw/main/IMRPhenomD/16s_nospins/basis_multiband_addcal.hdf5
......@@ -3,7 +3,7 @@ from datetime import date
with open("dockerfile-template", "r") as ff:
template = ff.read()
python_versions = [(3, 9), (3, 10), (3, 11)]
python_versions = [(3, 10), (3, 11)]
today = date.today().strftime("%Y%m%d")
for python_major_version, python_minor_version in python_versions:
......
......@@ -10,7 +10,7 @@ Installation
$ conda install -c conda-forge bilby
Supported python versions: 3.9-3.11.
Supported python versions: 3.10-3.11.
.. tab:: Pip
......@@ -18,7 +18,7 @@ Installation
$ pip install bilby
Supported python versions: 3.9-3.11.
Supported python versions: 3.10-3.11.
This will install all requirements for running :code:`bilby` for general
......@@ -47,7 +47,7 @@ wave inference, please additionally run the following commands.
Install bilby from source
-------------------------
:code:`bilby` is developed and tested with Python 3.9-3.11. In the
:code:`bilby` is developed and tested with Python 3.10-3.11. In the
following, we assume you have a working python installation, `python pip
<https://packaging.python.org/tutorials/installing-packages/#use-pip-for-installing)>`_,
and `git <https://git-scm.com/>`_. See :ref:`installing-python` for our
......
......@@ -5,8 +5,8 @@ import sys
import os
python_version = sys.version_info
if python_version < (3, 9):
sys.exit("Python < 3.9 is not supported, aborting setup")
if python_version < (3, 10):
sys.exit("Python < 3.10 is not supported, aborting setup")
def get_long_description():
......@@ -66,7 +66,7 @@ setup(
"bilby.gw.detector": ["noise_curves/*.txt", "detectors/*"],
"bilby.gw.eos": ["eos_tables/*.dat"],
},
python_requires=">=3.9",
python_requires=">=3.10",
install_requires=get_requirements(),
extras_require={
"gw": get_requirements("gw"),
......@@ -104,7 +104,6 @@ setup(
],
},
classifiers=[
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"License :: OSI Approved :: MIT License",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment