Skip to content

Commit

Permalink
Revert moving ciecplib import
Browse files Browse the repository at this point in the history
  • Loading branch information
spxiwh committed Aug 31, 2023
1 parent a9fa821 commit 408842b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/basic-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: installing system packages
run: |
sudo apt-get -o Acquire::Retries=3 update
sudo apt-get -o Acquire::Retries=3 install *fftw3* mpi intel-mkl* git-lfs graphviz libkrb5-dev
sudo apt-get -o Acquire::Retries=3 install *fftw3* mpi intel-mkl* git-lfs graphviz
pip install "tox<4.0.0" pip setuptools --upgrade
- name: installing auxiliary data files
run: |
Expand Down
7 changes: 4 additions & 3 deletions pycbc/workflow/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,8 @@
import urllib.parse
from urllib.parse import urlparse

import pycbc.libutils
from pycbc.types.config import InterpolatingConfigParser

ciecplib = pycbc.libutils.import_optional('ciecplib')

# NOTE urllib is weird. For some reason it only allows known schemes and will
# give *wrong* results, rather then failing, if you use something like gsiftp
# We can add schemes explicitly, as below, but be careful with this!
Expand Down Expand Up @@ -86,6 +83,10 @@ def resolve_url(url, directory=None, permissions=None, copy_to_cwd=True):
shutil.copy(u.path, filename)

elif u.scheme == "http" or u.scheme == "https":
# Would like to move ciecplib import to top using import_optional, but
# it needs to be available when documentation runs in the CI, and I
# can't get it to install in the GitHub CI
import ciecplib
with ciecplib.Session() as s:
if u.netloc in ("git.ligo.org", "code.pycbc.phy.syr.edu"):
# authenticate with git.ligo.org using callback
Expand Down

0 comments on commit 408842b

Please sign in to comment.