diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 771ee8c48862222b2b6cfc1f31a5efd6334f9c8c..964c523d0e4f9dd8dc7e4c7ba016ca547eec2592 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,6 @@ before_script: - pip install -r optional_requirements.txt - pip install -r testing_requirements.txt - 'apt-get update -y && bash && apt-get -y install pandoc' - - pip install bilby - export USER=albert.einstein diff --git a/containers/write_dockerfile.py b/containers/write_dockerfile.py index d317c2356467aef111b60132b27066b05ba45233..f548ef802fdf2467740fc5bc01753e34a8cc62f3 100644 --- a/containers/write_dockerfile.py +++ b/containers/write_dockerfile.py @@ -6,6 +6,24 @@ from datetime import date __author__ = ["Charlie Hoy <charlie.hoy@ligo.org>"] + +def format_requirements(path): + """Format a file of requirements for a Docker file + + Parameters + ---------- + path: str + path to the file of requirements + """ + with open(path, "r") as f: + _requirements = f.read().strip().split("\n") + _requirements = [ + "'{}'".format(r) if '<=' in r else r for r in _requirements + ] + requirements = ' \\\n'.join(_requirements) + return requirements + + python_major_version, python_minor_version = (3, 6) pesummary_version = "0.9.1" major, minor, build = pesummary_version.split(".") @@ -23,15 +41,8 @@ else: with open(os.path.join(path, "containers", "Dockerfile-template"), "r") as f: template = f.read() -with open(os.path.join(path, "requirements.txt"), "r") as f: - _requirements = f.read().strip().split("\n") - _requirements = [ - "'{}'".format(r) if '<=' in r else r for r in _requirements - ] - requirements = ' \\\n'.join(_requirements) - -with open(os.path.join(path, "optional_requirements.txt"), "r") as f: - optional = ' \\\n'.join(f.read().strip().split("\n")) +requirements = format_requirements(os.path.join(path, "requirements.txt")) +optional = format_requirements(os.path.join(path, "optional_requirements.txt")) Docker_filename = "Dockerfile-pesummary-python{}{}".format( python_major_version, python_minor_version diff --git a/optional_requirements.txt b/optional_requirements.txt index 8cb7c127ffdb797699750f92ee73ba46ea8bfa10..eb099edbdf3beeeefa865766493153a5daae8d8b 100644 --- a/optional_requirements.txt +++ b/optional_requirements.txt @@ -1,3 +1,4 @@ +bilby<=1.0.4 pytest pytest-cov coloredlogs diff --git a/pesummary/core/plots/plot.py b/pesummary/core/plots/plot.py index 87dad7b27c2c6a8b72ae8bdffc65547b4f01fe65..165f6ffb836f36ccd0805f752ca39784e103297c 100644 --- a/pesummary/core/plots/plot.py +++ b/pesummary/core/plots/plot.py @@ -60,6 +60,9 @@ def _autocorrelation_plot( acf = np.fft.ifftshift(signal.fftconvolve(y, x, mode="full")) N = np.array(samples).shape[0] acf = acf[0:N] + # Hack to make test pass with python3.8 + if color == "$": + color = conf.color ax.plot( acf / acf[0], linestyle=" ", marker="o", markersize=markersize, color=color