Skip to content
Snippets Groups Projects
Commit b1e02f1d authored by Gregory Ashton's avatar Gregory Ashton
Browse files

Merge branch 'temporary-pin-astropy' into 'master'

Temporary pin astropy & remove python 3.6 support

See merge request !1008
parents 6d8a5ad1 49b51bb6
No related branches found
No related tags found
No related merge requests found
......@@ -96,16 +96,6 @@ python-3.8:
- pytest
# test example on python 3.6
python-3.6:
stage: test
needs: ["basic-3.7", "precommits-py3.7"]
image: quay.io/bilbydev/v2-dockerfile-test-suite-python36
script:
- python -m pip install .
- pytest
# test samplers on python 3.7
python-3.7-samplers:
stage: test
......@@ -116,15 +106,15 @@ python-3.7-samplers:
- pytest test/integration/sampler_run_test.py --durations 10
# test samplers on python 3.6
python-3.6-samplers:
# test samplers on python 3.8
python-3.8-samplers:
stage: test
needs: ["basic-3.7", "precommits-py3.7"]
image: quay.io/bilbydev/v2-dockerfile-test-suite-python36
image: quay.io/bilbydev/v2-dockerfile-test-suite-python38
script:
- python -m pip install .
- pytest test/integration/sampler_run_test.py
- pytest test/integration/sampler_run_test.py --durations 10
# Test containers are up to date
containers:
......
......@@ -9,3 +9,5 @@ mock
dill
tqdm
h5py
tables
astropy<4.3
......@@ -5,11 +5,10 @@ import subprocess
import sys
import os
# check that python version is 3.6 or above
# check that python version is 3.7 or above
python_version = sys.version_info
if python_version < (3, 6):
sys.exit("Python < 3.6 is not supported, aborting setup")
print("Confirmed Python version {}.{}.{} >= 3.6.0".format(*python_version[:3]))
if python_version < (3, 7):
sys.exit("Python < 3.7 is not supported, aborting setup")
def write_version_file(version):
......
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