diff --git a/containers/v2-dockerfile-test-suite-python35 b/containers/v2-dockerfile-test-suite-python35 deleted file mode 100644 index 40f7e2263279327d626af729e0cf9540350b1e37..0000000000000000000000000000000000000000 --- a/containers/v2-dockerfile-test-suite-python35 +++ /dev/null @@ -1,57 +0,0 @@ -# This dockerfile is written automatically and should not be modified by hand. - -FROM containers.ligo.org/docker/base:conda -LABEL name="bilby Base miniconda3" \ -maintainer="Gregory Ashton <gregory.ashton@ligo.org>" - -RUN conda update -n base -c defaults conda - -ENV conda_env python35 - -RUN conda create -n ${conda_env} python=3.5 -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 conda info -RUN python --version - -# Install pymultinest requirements -RUN apt-get update -RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \ -libatlas3-base libatlas-base-dev cmake build-essential gfortran - -# Install conda-installable programs -RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8 mock -RUN conda install -n ${conda_env} -c anaconda coverage configargparse future - -# Install conda-forge-installable programs -RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish arviz - -# Install pip-requirements -RUN pip install --upgrade pip -RUN pip install --upgrade setuptools coverage-badge - -# Install documentation requirements -RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc - -# Install dependencies and samplers -RUN pip install corner lalsuite theano healpy cython tables -RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 kombine dnest4 nessai -RUN conda install -n ${conda_env} -c conda-forge pymultinest ultranest - -# Install Polychord -RUN git clone https://github.com/PolyChord/PolyChordLite.git \ -&& (cd PolyChordLite && python setup.py --no-mpi install) - -# Install PTMCMCSampler -RUN git clone https://github.com/jellis18/PTMCMCSampler.git \ -&& (cd PTMCMCSampler && python setup.py install) - -# 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 diff --git a/containers/write_dockerfiles.py b/containers/write_dockerfiles.py index 75f2e969b0a581290e21e6a41997c3a7b28fa69f..9fea157bbbc4933bdbe46738086fc030fc1f0c82 100644 --- a/containers/write_dockerfiles.py +++ b/containers/write_dockerfiles.py @@ -3,7 +3,7 @@ from datetime import date with open("dockerfile-template", "r") as ff: template = ff.read() -python_versions = [(3, 5), (3, 6), (3, 7), (3, 8)] +python_versions = [(3, 6), (3, 7), (3, 8)] today = date.today().strftime("%Y%m%d") for python_major_version, python_minor_version in python_versions: diff --git a/docs/installation.txt b/docs/installation.txt index 7a6a88f7daebd16e28d6dc1420e5eca98f26107e..3206c9449d8d904f5d9219c7a50319f171e1e17a 100644 --- a/docs/installation.txt +++ b/docs/installation.txt @@ -10,7 +10,7 @@ Installation $ conda install -c conda-forge bilby - Supported python versions: 3.5+. + Supported python versions: 3.6+. .. tab:: Pip @@ -18,7 +18,7 @@ Installation $ pip install bilby - Supported python versions: 3.5+. + Supported python versions: 3.6+. This will install all requirements for running :code:`bilby` for general diff --git a/setup.py b/setup.py index dda5328c241626141666af0e90f758e1e88b45fa..575b97ce124f0ba2e93f4fbd29268013588a333f 100644 --- a/setup.py +++ b/setup.py @@ -5,11 +5,11 @@ import subprocess import sys import os -# check that python version is 3.5 or above +# check that python version is 3.6 or above python_version = sys.version_info -if python_version < (3, 5): - sys.exit("Python < 3.5 is not supported, aborting setup") -print("Confirmed Python version {}.{}.{} >= 3.5.0".format(*python_version[:3])) +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])) def write_version_file(version): @@ -91,7 +91,7 @@ setup(name='bilby', 'bilby.gw.detector': ['noise_curves/*.txt', 'detectors/*'], 'bilby.gw.eos': ['eos_tables/*.dat'], 'bilby': [version_file]}, - python_requires='>=3.5', + python_requires='>=3.6', install_requires=get_requirements(), entry_points={'console_scripts': ['bilby_plot=cli_bilby.plot_multiple_posteriors:main',