handle empty gridftp dirs properly (#368)

* handle empty gridftp dirs properly * <bot> update requirements-docs.txt * <bot> update requirements-tests.txt * <bot> update requirements.txt --------- Co-authored-by: github-actions <[email protected]>
WIPACrepo · Feb 24, 2024 · 1ef6661 · 1ef6661
1 parent 75abfed
commit 1ef6661
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 50 deletions.
diff --git a/iceprod/core/gridftp.py b/iceprod/core/gridftp.py
@@ -221,6 +221,8 @@ def list(cls, address, request_timeout=None, details=False, dotfiles=False):
 
         ret = _cmd_output(cmd, timeout=timeout)
         if ret[0]:
+            if (not dotfiles) and 'No match for' in ret[1]:
+                return []
             logger.warning(f'{ret[1]}')
             raise Exception('Error getting listing')
         return listify(ret[1], details=details, dotfiles=dotfiles)

diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -6,15 +6,15 @@
 #
 alabaster==0.7.16
     # via sphinx
-anyio==4.2.0
+anyio==4.3.0
     # via httpx
 asyncache==0.3.1
     # via iceprod (setup.py)
 babel==2.14.0
     # via sphinx
-boto3==1.34.31
+boto3==1.34.49
     # via iceprod (setup.py)
-botocore==1.34.31
+botocore==1.34.49
     # via
     #   boto3
     #   s3transfer
@@ -23,7 +23,7 @@ cachetools==5.3.2
     #   asyncache
     #   iceprod (setup.py)
     #   wipac-rest-tools
-certifi==2023.11.17
+certifi==2024.2.2
     # via
     #   httpcore
     #   httpx
@@ -33,22 +33,22 @@ cffi==1.16.0
     # via cryptography
 charset-normalizer==3.3.2
     # via requests
-cryptography==42.0.2
+cryptography==42.0.5
     # via
     #   iceprod (setup.py)
     #   pyjwt
     #   pyopenssl
-dnspython==2.5.0
+dnspython==2.6.1
     # via pymongo
 docutils==0.20.1
     # via sphinx
 exceptiongroup==1.2.0
     # via anyio
 h11==0.14.0
     # via httpcore
-httpcore==1.0.2
+httpcore==1.0.4
     # via httpx
-httpx==0.26.0
+httpx==0.27.0
     # via iceprod (setup.py)
 idna==3.6
     # via
@@ -65,7 +65,7 @@ jmespath==1.0.1
     #   botocore
 ldap3==2.9.1
     # via iceprod (setup.py)
-markupsafe==2.1.4
+markupsafe==2.1.5
     # via jinja2
 motor==3.3.2
     # via iceprod (setup.py)
@@ -80,10 +80,8 @@ pycparser==2.21
 pygments==2.17.2
     # via sphinx
 pyjwt[crypto]==2.8.0
-    # via
-    #   pyjwt
-    #   wipac-rest-tools
-pymongo==4.6.1
+    # via wipac-rest-tools
+pymongo==4.6.2
     # via
     #   iceprod (setup.py)
     #   motor
@@ -157,7 +155,7 @@ urllib3==2.0.7
     #   botocore
     #   requests
     #   wipac-rest-tools
-wipac-dev-tools==1.8.2
+wipac-dev-tools==1.9.1
     # via
     #   iceprod (setup.py)
     #   wipac-rest-tools

diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -4,17 +4,17 @@
 #
 #    pip-compile --extra=tests --output-file=requirements-tests.txt
 #
-anyio==4.2.0
+anyio==4.3.0
     # via httpx
 asyncache==0.3.1
     # via iceprod (setup.py)
 beautifulsoup4==4.12.3
     # via iceprod (setup.py)
-boto3==1.34.31
+boto3==1.34.49
     # via
     #   iceprod (setup.py)
     #   moto
-botocore==1.34.31
+botocore==1.34.49
     # via
     #   boto3
     #   moto
@@ -24,7 +24,7 @@ cachetools==5.3.2
     #   asyncache
     #   iceprod (setup.py)
     #   wipac-rest-tools
-certifi==2023.11.17
+certifi==2024.2.2
     # via
     #   httpcore
     #   httpx
@@ -34,17 +34,17 @@ cffi==1.16.0
     # via cryptography
 charset-normalizer==3.3.2
     # via requests
-coverage[toml]==7.4.1
+coverage[toml]==7.4.3
     # via
     #   iceprod (setup.py)
     #   pytest-cov
-cryptography==42.0.2
+cryptography==42.0.5
     # via
     #   iceprod (setup.py)
     #   moto
     #   pyjwt
     #   pyopenssl
-dnspython==2.5.0
+dnspython==2.6.1
     # via pymongo
 exceptiongroup==1.2.0
     # via
@@ -56,9 +56,9 @@ flexmock==0.11.3
     # via iceprod (setup.py)
 h11==0.14.0
     # via httpcore
-httpcore==1.0.2
+httpcore==1.0.4
     # via httpx
-httpx==0.26.0
+httpx==0.27.0
     # via
     #   iceprod (setup.py)
     #   respx
@@ -77,18 +77,16 @@ jmespath==1.0.1
     #   botocore
 ldap3==2.9.1
     # via iceprod (setup.py)
-markupsafe==2.1.4
+markupsafe==2.1.5
     # via
     #   jinja2
     #   werkzeug
 mccabe==0.7.0
     # via flake8
 mock==5.1.0
     # via iceprod (setup.py)
-moto[s3]==5.0.0
-    # via
-    #   iceprod (setup.py)
-    #   moto
+moto[s3]==5.0.2
+    # via iceprod (setup.py)
 motor==3.3.2
     # via iceprod (setup.py)
 packaging==23.2
@@ -97,7 +95,7 @@ pluggy==1.4.0
     # via pytest
 psutil==5.9.8
     # via iceprod (setup.py)
-py-partiql-parser==0.5.0
+py-partiql-parser==0.5.1
     # via moto
 pyasn1==0.5.1
     # via ldap3
@@ -108,24 +106,22 @@ pycparser==2.21
 pyflakes==3.2.0
     # via flake8
 pyjwt[crypto]==2.8.0
-    # via
-    #   pyjwt
-    #   wipac-rest-tools
-pymongo==4.6.1
+    # via wipac-rest-tools
+pymongo==4.6.2
     # via
     #   iceprod (setup.py)
     #   motor
 pyopenssl==24.0.0
     # via iceprod (setup.py)
 pypng==0.20220715.0
     # via qrcode
-pytest==7.4.4
+pytest==8.0.2
     # via
     #   iceprod (setup.py)
     #   pytest-asyncio
     #   pytest-cov
     #   pytest-mock
-pytest-asyncio==0.23.4
+pytest-asyncio==0.23.5
     # via iceprod (setup.py)
 pytest-cov==4.1.0
     # via iceprod (setup.py)
@@ -161,7 +157,7 @@ requests-mock==1.11.0
     # via iceprod (setup.py)
 requests-toolbelt==1.0.0
     # via iceprod (setup.py)
-responses==0.24.1
+responses==0.25.0
     # via moto
 respx==0.20.2
     # via iceprod (setup.py)
@@ -204,7 +200,7 @@ urllib3==2.0.7
     #   wipac-rest-tools
 werkzeug==3.0.1
     # via moto
-wipac-dev-tools==1.8.2
+wipac-dev-tools==1.9.1
     # via
     #   iceprod (setup.py)
     #   wipac-rest-tools

diff --git a/requirements.txt b/requirements.txt
@@ -4,13 +4,13 @@
 #
 #    pip-compile --output-file=requirements.txt
 #
-anyio==4.2.0
+anyio==4.3.0
     # via httpx
 asyncache==0.3.1
     # via iceprod (setup.py)
-boto3==1.34.31
+boto3==1.34.49
     # via iceprod (setup.py)
-botocore==1.34.31
+botocore==1.34.49
     # via
     #   boto3
     #   s3transfer
@@ -19,7 +19,7 @@ cachetools==5.3.2
     #   asyncache
     #   iceprod (setup.py)
     #   wipac-rest-tools
-certifi==2023.11.17
+certifi==2024.2.2
     # via
     #   httpcore
     #   httpx
@@ -29,20 +29,20 @@ cffi==1.16.0
     # via cryptography
 charset-normalizer==3.3.2
     # via requests
-cryptography==42.0.2
+cryptography==42.0.5
     # via
     #   iceprod (setup.py)
     #   pyjwt
     #   pyopenssl
-dnspython==2.5.0
+dnspython==2.6.1
     # via pymongo
 exceptiongroup==1.2.0
     # via anyio
 h11==0.14.0
     # via httpcore
-httpcore==1.0.2
+httpcore==1.0.4
     # via httpx
-httpx==0.26.0
+httpx==0.27.0
     # via iceprod (setup.py)
 idna==3.6
     # via
@@ -64,10 +64,8 @@ pyasn1==0.5.1
 pycparser==2.21
     # via cffi
 pyjwt[crypto]==2.8.0
-    # via
-    #   pyjwt
-    #   wipac-rest-tools
-pymongo==4.6.1
+    # via wipac-rest-tools
+pymongo==4.6.2
     # via
     #   iceprod (setup.py)
     #   motor
@@ -124,7 +122,7 @@ urllib3==2.0.7
     #   botocore
     #   requests
     #   wipac-rest-tools
-wipac-dev-tools==1.8.2
+wipac-dev-tools==1.9.1
     # via
     #   iceprod (setup.py)
     #   wipac-rest-tools