From a2bef06f13c6ca4132447d0b7e7e154bfc5ea29a Mon Sep 17 00:00:00 2001 From: David Schultz Date: Wed, 13 Mar 2024 21:13:46 -0500 Subject: [PATCH 1/6] update sphinx options to re-enable autodocs --- docs/conf.py | 5 ++++- docs/server/auth.rst | 2 +- docs/server/dbmethods.rst | 24 ------------------------ docs/server/tornado.rst | 4 ---- 4 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 docs/server/dbmethods.rst delete mode 100644 docs/server/tornado.rst diff --git a/docs/conf.py b/docs/conf.py index 00898317b..5184a462f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -89,7 +89,10 @@ def nodecorate(func): autodoc_member_order = 'bysource' autoclass_content = 'both' -autodoc_default_flags = ['members', 'undoc-members'] +autodoc_default_options = { + 'members': True, + 'undoc-members': True, +} # Without this line sphinx includes a copy of object.__init__'s docstring # on any class that doesn't define __init__. diff --git a/docs/server/auth.rst b/docs/server/auth.rst index 5aee397be..fa706927a 100644 --- a/docs/server/auth.rst +++ b/docs/server/auth.rst @@ -5,4 +5,4 @@ Token Authentication ==================== -.. automodule:: iceprod.server.auth \ No newline at end of file +.. automodule:: iceprod.client_auth diff --git a/docs/server/dbmethods.rst b/docs/server/dbmethods.rst deleted file mode 100644 index 0dd8781a8..000000000 --- a/docs/server/dbmethods.rst +++ /dev/null @@ -1,24 +0,0 @@ -.. index:: dbmethods -.. _dbmethods: - - - -DB Methods -========== - -.. automodule:: iceprod.server.dbmethods - - -.. automodule:: iceprod.server.dbmethods.auth - -.. automodule:: iceprod.server.dbmethods.queue - -.. automodule:: iceprod.server.dbmethods.rpc - -.. automodule:: iceprod.server.dbmethods.web - -.. automodule:: iceprod.server.dbmethods.node - -.. automodule:: iceprod.server.dbmethods.cron - -.. automodule:: iceprod.server.dbmethods.misc \ No newline at end of file diff --git a/docs/server/tornado.rst b/docs/server/tornado.rst deleted file mode 100644 index 37ac7313c..000000000 --- a/docs/server/tornado.rst +++ /dev/null @@ -1,4 +0,0 @@ -Tornado Web Utilities -===================== - -.. automodule:: iceprod.server.tornado \ No newline at end of file From 159879193e566d547cac1730356b1de5cfed442e Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 14 Mar 2024 02:14:34 +0000 Subject: [PATCH 2/6] update requirements-docs.txt --- requirements-docs.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements-docs.txt b/requirements-docs.txt index cd3042515..744c784cf 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -12,13 +12,13 @@ asyncache==0.3.1 # via iceprod (setup.py) babel==2.14.0 # via sphinx -boto3==1.34.49 +boto3==1.34.62 # via iceprod (setup.py) -botocore==1.34.49 +botocore==1.34.62 # via # boto3 # s3transfer -cachetools==5.3.2 +cachetools==5.3.3 # via # asyncache # iceprod (setup.py) @@ -69,7 +69,7 @@ markupsafe==2.1.5 # via jinja2 motor==3.3.2 # via iceprod (setup.py) -packaging==23.2 +packaging==24.0 # via sphinx psutil==5.9.8 # via iceprod (setup.py) @@ -85,11 +85,11 @@ pymongo==4.6.2 # via # iceprod (setup.py) # motor -pyopenssl==24.0.0 +pyopenssl==24.1.0 # via iceprod (setup.py) pypng==0.20220715.0 # via qrcode -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # botocore # iceprod (setup.py) @@ -117,7 +117,7 @@ setproctitle==1.3.3 # via iceprod (setup.py) six==1.16.0 # via python-dateutil -sniffio==1.3.0 +sniffio==1.3.1 # via # anyio # httpx @@ -143,7 +143,7 @@ tornado==6.4 # via # iceprod (setup.py) # wipac-rest-tools -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # anyio # qrcode From a3ea02de10e70d3f76ba93181896c8420e95da58 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 14 Mar 2024 02:14:34 +0000 Subject: [PATCH 3/6] update requirements-tests.txt --- requirements-tests.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/requirements-tests.txt b/requirements-tests.txt index 7b4133d65..61000fbc6 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -10,16 +10,16 @@ asyncache==0.3.1 # via iceprod (setup.py) beautifulsoup4==4.12.3 # via iceprod (setup.py) -boto3==1.34.49 +boto3==1.34.62 # via # iceprod (setup.py) # moto -botocore==1.34.49 +botocore==1.34.62 # via # boto3 # moto # s3transfer -cachetools==5.3.2 +cachetools==5.3.3 # via # asyncache # iceprod (setup.py) @@ -85,11 +85,11 @@ mccabe==0.7.0 # via flake8 mock==5.1.0 # via iceprod (setup.py) -moto[s3]==5.0.2 +moto[s3]==5.0.3 # via iceprod (setup.py) motor==3.3.2 # via iceprod (setup.py) -packaging==23.2 +packaging==24.0 # via pytest pluggy==1.4.0 # via pytest @@ -111,23 +111,23 @@ pymongo==4.6.2 # via # iceprod (setup.py) # motor -pyopenssl==24.0.0 +pyopenssl==24.1.0 # via iceprod (setup.py) pypng==0.20220715.0 # via qrcode -pytest==8.0.2 +pytest==8.1.1 # via # iceprod (setup.py) # pytest-asyncio # pytest-cov # pytest-mock -pytest-asyncio==0.23.5 +pytest-asyncio==0.23.5.post1 # via iceprod (setup.py) pytest-cov==4.1.0 # via iceprod (setup.py) pytest-mock==3.12.0 # via iceprod (setup.py) -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # botocore # iceprod (setup.py) @@ -169,7 +169,7 @@ six==1.16.0 # via # python-dateutil # requests-mock -sniffio==1.3.0 +sniffio==1.3.1 # via # anyio # httpx @@ -185,7 +185,7 @@ tornado==6.4 # via # iceprod (setup.py) # wipac-rest-tools -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # anyio # qrcode From d03c6a4c97ddcde39adbb97d19aebd295e4dcc51 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 14 Mar 2024 02:14:34 +0000 Subject: [PATCH 4/6] update requirements.txt --- requirements.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8824dfd39..7ad413dd1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,13 +8,13 @@ anyio==4.3.0 # via httpx asyncache==0.3.1 # via iceprod (setup.py) -boto3==1.34.49 +boto3==1.34.62 # via iceprod (setup.py) -botocore==1.34.49 +botocore==1.34.62 # via # boto3 # s3transfer -cachetools==5.3.2 +cachetools==5.3.3 # via # asyncache # iceprod (setup.py) @@ -69,11 +69,11 @@ pymongo==4.6.2 # via # iceprod (setup.py) # motor -pyopenssl==24.0.0 +pyopenssl==24.1.0 # via iceprod (setup.py) pypng==0.20220715.0 # via qrcode -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # botocore # iceprod (setup.py) @@ -100,7 +100,7 @@ setproctitle==1.3.3 # via iceprod (setup.py) six==1.16.0 # via python-dateutil -sniffio==1.3.0 +sniffio==1.3.1 # via # anyio # httpx @@ -110,7 +110,7 @@ tornado==6.4 # via # iceprod (setup.py) # wipac-rest-tools -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # anyio # qrcode From 83c44cd509aaceba814ab96392f4c8a41066b7a8 Mon Sep 17 00:00:00 2001 From: David Schultz Date: Wed, 13 Mar 2024 21:18:51 -0500 Subject: [PATCH 5/6] flexmock doesn't like pytest 8.1 yet --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index e155c582e..9e994b80e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -77,7 +77,7 @@ tests = flexmock mock moto[s3]>=5 - pytest + pytest<8.1 pytest-asyncio pytest-cov pytest-mock From c6a284d22c0f66158cd4449b2d408406456c3c41 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 14 Mar 2024 02:19:23 +0000 Subject: [PATCH 6/6] 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 61000fbc6..0686b9cd8 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -115,7 +115,7 @@ pyopenssl==24.1.0 # via iceprod (setup.py) pypng==0.20220715.0 # via qrcode -pytest==8.1.1 +pytest==8.0.2 # via # iceprod (setup.py) # pytest-asyncio