From b9337bac7ad822522fb810c678b81f81db276105 Mon Sep 17 00:00:00 2001 From: David Schultz Date: Wed, 11 Oct 2023 14:10:39 -0500 Subject: [PATCH 01/11] Update basic_submit.py fix docstring --- bin/basic_submit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/basic_submit.py b/bin/basic_submit.py index 3cc51dee2..ee1e76061 100755 --- a/bin/basic_submit.py +++ b/bin/basic_submit.py @@ -23,7 +23,7 @@ An example submission:: - ./basic_submit.py --token XXXX --env_shell '/cvmfs/icecube.opensciencegrid.org/py3-v4.1.1/icetray-env combo/stable' my_script.py '--foo=bar $(input) $(output)' job_files.txt + ./basic_submit.py --env_shell '/cvmfs/icecube.opensciencegrid.org/py3-v4.1.1/icetray-env combo/stable' my_script.py '--foo=bar $(input) $(output)' job_files.txt This will execute `my_script.py` from the local directory, while in the combo/stable environment. If the first line of `job_files.txt` contains:: From 9277f6bdbca1d1de024618cbb55f507835220f10 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Oct 2023 19:10:57 +0000 Subject: [PATCH 02/11] update setup.cfg --- setup.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index fc9038823..01fb9fa1e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,6 +26,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 download_url = https://pypi.org/project/iceprod/ project_urls = Tracker = https://github.com/WIPACrepo/iceprod/issues @@ -65,7 +66,7 @@ install_requires = unidecode wipac-dev-tools wipac-rest-tools -python_requires = >=3.8, <3.12 +python_requires = >=3.8, <3.13 packages = find: [options.extras_require] From dfc03d01f931a12e5b0506eae32269bc1fa90c2d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Oct 2023 19:11:23 +0000 Subject: [PATCH 03/11] update requirements-docs.txt --- requirements-docs.txt | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/requirements-docs.txt b/requirements-docs.txt index 0664ce2b4..675815392 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -10,11 +10,11 @@ anyio==4.0.0 # via httpcore asyncache==0.3.1 # via iceprod (setup.py) -babel==2.12.1 +babel==2.13.0 # via sphinx -boto3==1.28.56 +boto3==1.28.62 # via iceprod (setup.py) -botocore==1.31.56 +botocore==1.31.62 # via # boto3 # s3transfer @@ -29,9 +29,9 @@ certifi==2023.7.22 # httpx # iceprod (setup.py) # requests -cffi==1.15.1 +cffi==1.16.0 # via cryptography -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via requests cryptography==41.0.4 # via @@ -69,7 +69,7 @@ markupsafe==2.1.3 # via jinja2 motor==3.3.1 # via iceprod (setup.py) -packaging==23.1 +packaging==23.2 # via sphinx psutil==5.9.5 # via iceprod (setup.py) @@ -113,7 +113,7 @@ requests-toolbelt==1.0.0 # via iceprod (setup.py) s3transfer==0.7.0 # via boto3 -setproctitle==1.3.2 +setproctitle==1.3.3 # via iceprod (setup.py) six==1.16.0 # via python-dateutil @@ -156,13 +156,14 @@ typing-extensions==4.8.0 # wipac-dev-tools unidecode==1.3.7 # via iceprod (setup.py) -urllib3==1.26.16 +urllib3==2.0.6 # via # botocore # requests -wipac-dev-tools==1.6.16 + # wipac-rest-tools +wipac-dev-tools==1.7.0 # via # iceprod (setup.py) # wipac-rest-tools -wipac-rest-tools==1.5.2 +wipac-rest-tools==1.6.0 # via iceprod (setup.py) From 3f3654e5dac4138bcb59a9f141a1179ce8bcf694 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Oct 2023 19:11:23 +0000 Subject: [PATCH 04/11] update requirements-tests.txt --- requirements-tests.txt | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/requirements-tests.txt b/requirements-tests.txt index ab5494935..0a3822d57 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -10,11 +10,11 @@ asyncache==0.3.1 # via iceprod (setup.py) beautifulsoup4==4.12.2 # via iceprod (setup.py) -boto3==1.28.56 +boto3==1.28.62 # via # iceprod (setup.py) # moto -botocore==1.31.56 +botocore==1.31.62 # via # boto3 # moto @@ -30,11 +30,11 @@ certifi==2023.7.22 # httpx # iceprod (setup.py) # requests -cffi==1.15.1 +cffi==1.16.0 # via cryptography -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via requests -coverage[toml]==7.3.1 +coverage[toml]==7.3.2 # via # iceprod (setup.py) # pytest-cov @@ -85,11 +85,11 @@ mccabe==0.7.0 # via flake8 mock==5.1.0 # via iceprod (setup.py) -moto==4.2.4 +moto==4.2.5 # via iceprod (setup.py) motor==3.3.1 # via iceprod (setup.py) -packaging==23.1 +packaging==23.2 # via pytest pluggy==1.3.0 # via pytest @@ -160,7 +160,7 @@ respx==0.20.2 # via iceprod (setup.py) s3transfer==0.7.0 # via boto3 -setproctitle==1.3.2 +setproctitle==1.3.3 # via iceprod (setup.py) six==1.16.0 # via @@ -191,18 +191,19 @@ typing-extensions==4.8.0 # wipac-dev-tools unidecode==1.3.7 # via iceprod (setup.py) -urllib3==1.26.16 +urllib3==2.0.6 # via # botocore # requests # responses -werkzeug==2.3.7 + # wipac-rest-tools +werkzeug==3.0.0 # via moto -wipac-dev-tools==1.6.16 +wipac-dev-tools==1.7.0 # via # iceprod (setup.py) # wipac-rest-tools -wipac-rest-tools==1.5.2 +wipac-rest-tools==1.6.0 # via iceprod (setup.py) xmltodict==0.13.0 # via moto From bc9ca84492a314c8fbb4a970b56438456221f744 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Oct 2023 19:11:23 +0000 Subject: [PATCH 05/11] update requirements.txt --- requirements.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 989d6d871..9f1d0b727 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,9 +8,9 @@ anyio==4.0.0 # via httpcore asyncache==0.3.1 # via iceprod (setup.py) -boto3==1.28.56 +boto3==1.28.62 # via iceprod (setup.py) -botocore==1.31.56 +botocore==1.31.62 # via # boto3 # s3transfer @@ -25,9 +25,9 @@ certifi==2023.7.22 # httpx # iceprod (setup.py) # requests -cffi==1.15.1 +cffi==1.16.0 # via cryptography -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via requests cryptography==41.0.4 # via @@ -96,7 +96,7 @@ requests-toolbelt==1.0.0 # via iceprod (setup.py) s3transfer==0.7.0 # via boto3 -setproctitle==1.3.2 +setproctitle==1.3.3 # via iceprod (setup.py) six==1.16.0 # via python-dateutil @@ -117,13 +117,14 @@ typing-extensions==4.8.0 # wipac-dev-tools unidecode==1.3.7 # via iceprod (setup.py) -urllib3==1.26.16 +urllib3==2.0.6 # via # botocore # requests -wipac-dev-tools==1.6.16 + # wipac-rest-tools +wipac-dev-tools==1.7.0 # via # iceprod (setup.py) # wipac-rest-tools -wipac-rest-tools==1.5.2 +wipac-rest-tools==1.6.0 # via iceprod (setup.py) From ee77fe0c289c76d968838be0801bfc6b0c57935f Mon Sep 17 00:00:00 2001 From: David Schultz Date: Wed, 11 Oct 2023 14:38:27 -0500 Subject: [PATCH 06/11] pin rest-tools for now, pending the big 3.0 upgrade --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 01fb9fa1e..45472771d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -65,7 +65,7 @@ install_requires = tornado unidecode wipac-dev-tools - wipac-rest-tools + wipac-rest-tools<1.6 python_requires = >=3.8, <3.13 packages = find: From 04984a4eb91230353d924df0b5899340a2e1381d Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Oct 2023 19:39:21 +0000 Subject: [PATCH 07/11] update requirements-docs.txt --- requirements-docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-docs.txt b/requirements-docs.txt index 675815392..585196d9c 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -165,5 +165,5 @@ wipac-dev-tools==1.7.0 # via # iceprod (setup.py) # wipac-rest-tools -wipac-rest-tools==1.6.0 +wipac-rest-tools==1.5.3 # via iceprod (setup.py) From f882d7ab73dbe82d7501238f8fc32853bdfa1c0f Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Oct 2023 19:39:21 +0000 Subject: [PATCH 08/11] update requirements-tests.txt --- requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-tests.txt b/requirements-tests.txt index 0a3822d57..8bae1480b 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -203,7 +203,7 @@ wipac-dev-tools==1.7.0 # via # iceprod (setup.py) # wipac-rest-tools -wipac-rest-tools==1.6.0 +wipac-rest-tools==1.5.3 # via iceprod (setup.py) xmltodict==0.13.0 # via moto From 24bd293c90e99dc98a8c92dff31531ef683e74ac Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Oct 2023 19:39:21 +0000 Subject: [PATCH 09/11] update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9f1d0b727..ffebddbe3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -126,5 +126,5 @@ wipac-dev-tools==1.7.0 # via # iceprod (setup.py) # wipac-rest-tools -wipac-rest-tools==1.6.0 +wipac-rest-tools==1.5.3 # via iceprod (setup.py) From c366ea66cb61f64e0e018ec025cb76011e82c152 Mon Sep 17 00:00:00 2001 From: David Schultz Date: Wed, 11 Oct 2023 14:42:57 -0500 Subject: [PATCH 10/11] set python max at 3.11 for now --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 45472771d..553573f9b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,6 +3,7 @@ author = WIPAC Developers author_email = developers@icecube.wisc.edu pypi_name = iceprod python_min = 3.8 +python_max = 3.11 package_dirs = iceprod keywords_spaced = batch workload From 77ffcefda5c9ef8b2b3af3446a790e8b0ae38fef Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Oct 2023 19:43:18 +0000 Subject: [PATCH 11/11] update setup.cfg --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 553573f9b..bcb5a2103 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,6 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 - Programming Language :: Python :: 3.12 download_url = https://pypi.org/project/iceprod/ project_urls = Tracker = https://github.com/WIPACrepo/iceprod/issues @@ -67,7 +66,7 @@ install_requires = unidecode wipac-dev-tools wipac-rest-tools<1.6 -python_requires = >=3.8, <3.13 +python_requires = >=3.8, <3.12 packages = find: [options.extras_require]