diff --git a/.github/workflows/inference-workflow.yml b/.github/workflows/inference-workflow.yml index d31076da5e6..704351cdb7e 100644 --- a/.github/workflows/inference-workflow.yml +++ b/.github/workflows/inference-workflow.yml @@ -25,7 +25,7 @@ jobs: wget -qO - https://download.pegasus.isi.edu/pegasus/gpg.txt | sudo apt-key add - echo "deb https://download.pegasus.isi.edu/pegasus/ubuntu bionic main" | sudo tee -a /etc/apt/sources.list sudo apt-get -o Acquire::Retries=3 update - sudo apt-get -o Acquire::Retries=3 install pegasus=5.0.6-1+ubuntu18 + sudo apt-get -o Acquire::Retries=3 install pegasus=5.0.8-1+ubuntu18 - run: sudo apt-get -o Acquire::Retries=3 install *fftw3* intel-mkl* - name: Install pycbc run: | diff --git a/.github/workflows/search-workflow.yml b/.github/workflows/search-workflow.yml index f7f8c744ad5..d3cd392ebb9 100644 --- a/.github/workflows/search-workflow.yml +++ b/.github/workflows/search-workflow.yml @@ -30,7 +30,7 @@ jobs: wget -qO - https://download.pegasus.isi.edu/pegasus/gpg.txt | sudo apt-key add - echo "deb https://download.pegasus.isi.edu/pegasus/ubuntu bionic main" | sudo tee -a /etc/apt/sources.list sudo apt-get -o Acquire::Retries=3 update - sudo apt-get -o Acquire::Retries=3 install pegasus=5.0.6-1+ubuntu18 + sudo apt-get -o Acquire::Retries=3 install pegasus=5.0.8-1+ubuntu18 - run: sudo apt-get -o Acquire::Retries=3 install *fftw3* intel-mkl* - name: Install pycbc run: | diff --git a/.github/workflows/tmpltbank-workflow.yml b/.github/workflows/tmpltbank-workflow.yml index e971e97b2b7..c460bcc0637 100644 --- a/.github/workflows/tmpltbank-workflow.yml +++ b/.github/workflows/tmpltbank-workflow.yml @@ -29,7 +29,7 @@ jobs: wget -qO - https://download.pegasus.isi.edu/pegasus/gpg.txt | sudo apt-key add - echo "deb https://download.pegasus.isi.edu/pegasus/ubuntu bionic main" | sudo tee -a /etc/apt/sources.list sudo apt-get -o Acquire::Retries=3 update - sudo apt-get -o Acquire::Retries=3 install pegasus=5.0.6-1+ubuntu18 + sudo apt-get -o Acquire::Retries=3 install pegasus=5.0.8-1+ubuntu18 - run: sudo apt-get -o Acquire::Retries=3 install *fftw3* intel-mkl* - name: Install pycbc run: | diff --git a/.github/workflows/workflow-tests.yml b/.github/workflows/workflow-tests.yml index 79643cc8793..1b49d7427a5 100644 --- a/.github/workflows/workflow-tests.yml +++ b/.github/workflows/workflow-tests.yml @@ -34,7 +34,7 @@ jobs: wget -qO - https://download.pegasus.isi.edu/pegasus/gpg.txt | sudo apt-key add - echo "deb https://download.pegasus.isi.edu/pegasus/ubuntu bionic main" | sudo tee -a /etc/apt/sources.list sudo apt-get -o Acquire::Retries=3 update - sudo apt-get -o Acquire::Retries=3 install pegasus=5.0.6-1+ubuntu18 + sudo apt-get -o Acquire::Retries=3 install pegasus=5.0.8-1+ubuntu18 - run: sudo apt-get -o Acquire::Retries=3 install *fftw3* intel-mkl* - name: Install pycbc run: | diff --git a/requirements.txt b/requirements.txt index 25f99b30322..3128f18f0a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,9 +17,17 @@ tqdm gwdatafind>=1.1.3 # Requirements for full pegasus env -pegasus-wms.api >= 5.0.6 -# Need GitPython: See discussion in https://github.com/gwastro/pycbc/pull/4454 +# https://pegasus.isi.edu/documentation/user-guide/installation.html#mixing-environments-system-venv-conda +# six is listed, but is now not needed. +pegasus-wms.api >= 5.0.8 +boto3 +certifi GitPython +pyjwt +pyyaml +s3transfer +urllib3 + # need to pin until pegasus for further upstream # addresses incompatibility between old flask/jinja2 and latest markupsafe markupsafe <= 2.0.1 diff --git a/setup.py b/setup.py index 652544bbd0e..03e2dbf8e9b 100755 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ 'tqdm', 'setuptools', 'gwdatafind', - 'pegasus-wms.api >= 5.0.6', + 'pegasus-wms.api >= 5.0.8', 'python-ligo-lw >= 1.7.0', 'ligo-segments', 'lalsuite!=7.2',