Merge pull request #43 from FAST-HEP/BK_remove_xrootd_glob

Remove xrootd glob

.requirements_dev.txt

@@ -5,3 +5,4 @@ pytest==4.5.0
 pytest-cov==2.7.1
 pytest-runner==4.4
 codecov==2.0.15
+xrootd>=4.10.0

.travis.yml

@@ -8,9 +8,26 @@ python:
  - "3.7"
 
 install:
+  - sudo apt-get update
+  # We do this conditionally because it saves us some downloading if the
+  # version is the same.
+  - if [[ "$TRAVIS_PYTHON_VERSION" == 3.[678]* ]]; then
+      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+      bash miniconda.sh -b -p $HOME/miniconda;
+      source "$HOME/miniconda/etc/profile.d/conda.sh";
+      hash -r;
+      conda config --set always_yes yes --set changeps1 no;
+      conda update -q conda;
+      conda info -a;
+
+      conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION;
+      conda activate test-environment;
+      conda install -c conda-forge xrootd;
+    fi
   - pip install -r .requirements_dev.txt
   - pip install .
 
+
 script: pytest -v --doctest-modules --cov-report=xml --cov=fast_curator tests/
 
 after_success:

CHANGELOG.md

@@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 ### Removed
 
+## [0.6.0] - 2020-04-17
+### Changed
+- Use Xrootd's implementation of xrootd_glob not our own version PR #43 [@benkrikler](https://github.com/benkrikler)
+
 ## [0.5.0] - 2020-01-27
 ### Added
 - Support for handling files which can't be opened PR #36 [@seriksen](https://github.com/seriksen)

fast_curator/catalogues/__init__.py

@@ -1,18 +1,23 @@
 import os
+import sys
 import uproot
 from collections import defaultdict, Counter
+from functools import partial
+if sys.version[0] > '2':
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
 
 
 class XrootdExpander():
     """
     Expand wild-carded file paths, including with xrootd-served files
     """
-    from .. import xrootd_glob
-
     @staticmethod
     def expand_file_list(files, prefix=None):
-        glob = XrootdExpander.xrootd_glob.glob
-        return expand_file_list_generic(files, prefix, glob=glob)
+        from XRootD.client.glob_funcs import glob
+        return expand_file_list_generic(files, prefix,
+                                        glob=partial(glob, raise_error=True))
 
     @staticmethod
     def check_files(*args, **kwargs):
@@ -38,7 +43,8 @@ def check_files(*args, **kwargs):
 def expand_file_list_generic(files, prefix, glob):
     full_list = []
     for name in files:
-        if not os.path.isabs(name):
+        scheme = urlparse(name).scheme
+        if not scheme and not os.path.isabs(name):
             if prefix:
                 name = os.path.join(prefix, name)
             else:

fast_curator/version.py

@@ -12,5 +12,5 @@ def split_version(version):
     return tuple(result)
 
 
-__version__ = '0.5.0'
+__version__ = '0.6.0'
 version_info = split_version(__version__) # noqa

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.0
+current_version = 0.6.0
 commit = True
 tag = False
 

setup.py

@@ -23,7 +23,7 @@ def get_version():
 
 setup_requirements = ['pytest-runner', ]
 
-test_requirements = ['pytest', 'flake8', 'pytest-cov']
+test_requirements = ['pytest', 'flake8', 'pytest-cov', 'xrootd']
 
 setup(
     author="F.A.S.T",