From 824ed5007ef175c892ffdb4305a9b348c41260ef Mon Sep 17 00:00:00 2001
From: Gregory Ashton <gregory.ashton@ligo.org>
Date: Fri, 17 Jun 2022 10:11:36 +0100
Subject: [PATCH] Add python 3.10 tests and update documentation
---
.gitlab-ci.yml | 27 ++++++++++++---------------
docs/installation.txt | 8 ++++----
setup.py | 1 +
3 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e79b89dd5..7663fbac2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,11 +144,10 @@ python-3.9:
- htmlcov/
expire_in: 30 days
-# add back when 3.10 image is available
-#python-3.10:
-# <<: *unit-test
-# needs: ["basic-3.10", "precommits-py3.10"]
-# image: containers.ligo.org/lscsoft/bilby/v2-bilby-python310
+python-3.10:
+ <<: *unit-test
+ needs: ["basic-3.10", "precommits-py3.10"]
+ image: containers.ligo.org/lscsoft/bilby/v2-bilby-python310
.test-sampler: &test-sampler
stage: test
@@ -168,11 +167,10 @@ python-3.9-samplers:
needs: ["basic-3.9", "precommits-py3.9"]
image: containers.ligo.org/lscsoft/bilby/v2-bilby-python39
-# add back when 3.10 image is available
-#python-3.10-samplers:
-# <<: *test-sampler
-# needs: ["basic-3.10", "precommits-py3.10"]
-# image: containers.ligo.org/lscsoft/bilby/v2-bilby-python310
+python-3.10-samplers:
+ <<: *test-sampler
+ needs: ["basic-3.10", "precommits-py3.10"]
+ image: containers.ligo.org/lscsoft/bilby/v2-bilby-python310
integration-tests-python-3.9:
stage: test
@@ -206,11 +204,10 @@ plotting-python-3.9:
image: containers.ligo.org/lscsoft/bilby/v2-bilby-python39
needs: ["basic-3.9", "precommits-py3.9"]
-# add back when 3.10 image is available
-#plotting-python-3.10:
-# <<: *plotting
-# image: containers.ligo.org/lscsoft/bilby/v2-bilby-python310
-# needs: ["basic-3.10", "precommits-py3.10"]
+plotting-python-3.10:
+ <<: *plotting
+ image: containers.ligo.org/lscsoft/bilby/v2-bilby-python310
+ needs: ["basic-3.10", "precommits-py3.10"]
# ------------------- Docs stage -------------------------------------------
diff --git a/docs/installation.txt b/docs/installation.txt
index bcda5f211..1533c559b 100644
--- a/docs/installation.txt
+++ b/docs/installation.txt
@@ -10,7 +10,7 @@ Installation
$ conda install -c conda-forge bilby
- Supported python versions: 3.6+.
+ Supported python versions: 3.8-3.10.
.. tab:: Pip
@@ -18,7 +18,7 @@ Installation
$ pip install bilby
- Supported python versions: 3.6+.
+ Supported python versions: 3.8-3.10.
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.6+. In the
+:code:`bilby` is developed and tested with Python 3.8-3.10. 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
@@ -116,7 +116,7 @@ file, you can do this from the link above, or run the command
$ wget https://repo.anaconda.com/archive/Anaconda3-5.2.0-Linux-x86_64.sh
-this will download an installer for python 3.6, for other versions check
+this will download a linux installer for python, for other versions check
the `anaconda page <https://www.anaconda.com/download/#linux>`_.
Then, `run the command
<https://conda.io/docs/user-guide/install/linux.html>`_
diff --git a/setup.py b/setup.py
index f937ab2bc..1bb6b8649 100644
--- a/setup.py
+++ b/setup.py
@@ -130,6 +130,7 @@ setup(
classifiers=[
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
+ "Programming Language :: Python :: 3.10",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
],
--
GitLab