From 60d21fa14a2b0c2db61bb0adbf3106e5331f27a4 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Thu, 3 Feb 2022 14:03:01 -0500 Subject: [PATCH 1/7] Mock `labscript_utils` to prevent RTD from trying to launch zprocess. --- docs/source/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/conf.py b/docs/source/conf.py index 7cca283..0eba5bd 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -51,6 +51,7 @@ autodoc_typehints = 'description' autosummary_generate = True add_module_names = False +autodoc_mock_imports = ['labscript_utils'] # Prefix each autosectionlabel with the name of the document it is in and a colon autosectionlabel_prefix_document = True From d9b0cd0c60fc3ba01ede404dda42c3b44a0d9911 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Thu, 3 Feb 2022 14:24:39 -0500 Subject: [PATCH 2/7] Remove mock, test which version of zprocess is causing change by temporarily pinning it. --- docs/source/conf.py | 1 - setup.cfg | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 0eba5bd..7cca283 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -51,7 +51,6 @@ autodoc_typehints = 'description' autosummary_generate = True add_module_names = False -autodoc_mock_imports = ['labscript_utils'] # Prefix each autosectionlabel with the name of the document it is in and a colon autosectionlabel_prefix_document = True diff --git a/setup.cfg b/setup.cfg index 6eb1061..b3dc2e8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,6 +31,7 @@ install_requires = numpy>=1.15 scipy matplotlib + zprocess==2.20.3 [options.extras_require] docs = From 9294f9834f037965bf3633b8712431c254e2e134 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Thu, 3 Feb 2022 14:27:16 -0500 Subject: [PATCH 3/7] Change pin back on more. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index b3dc2e8..209cb07 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,7 +31,7 @@ install_requires = numpy>=1.15 scipy matplotlib - zprocess==2.20.3 + zprocess==2.20.2 [options.extras_require] docs = From a5b195d95fa203f1eb2e75631f0f71419a73b7a4 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Thu, 3 Feb 2022 14:29:19 -0500 Subject: [PATCH 4/7] Back to last known working zprocess version. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 209cb07..0abef51 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,7 +31,7 @@ install_requires = numpy>=1.15 scipy matplotlib - zprocess==2.20.2 + zprocess==2.20.1 [options.extras_require] docs = From d5750bb4bf2de2245969ea55912d330707e9c634 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Thu, 3 Feb 2022 14:36:46 -0500 Subject: [PATCH 5/7] Remove zprocess pins and pin labscript-utils to last known working version. --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 0abef51..11408e3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,11 +27,10 @@ packages = find: python_requires = >=3.6 install_requires = importlib_metadata - labscript_utils>=3.0.0 + labscript_utils==3.1.0 numpy>=1.15 scipy matplotlib - zprocess==2.20.1 [options.extras_require] docs = From 755e562bb1d6e646571c2efd017aea6adcd07fc3 Mon Sep 17 00:00:00 2001 From: David Meyer Date: Fri, 4 Feb 2022 08:40:06 -0500 Subject: [PATCH 6/7] Reset pins, use importlib_metadata to get version in `conf.py`. --- docs/source/conf.py | 6 +++++- setup.cfg | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 7cca283..d92c22d 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -15,6 +15,10 @@ from m2r import MdInclude from recommonmark.transform import AutoStructify from jinja2 import FileSystemLoader, Environment +try: + import importlib.metadata as importlib_metadata +except ImportError: + import importlib_metadata # -- Project information (unique to each project) ------------------------------------- @@ -22,7 +26,7 @@ copyright = "2020, labscript suite" author = "labscript suite contributors" -from labscript import __version__ as version # noqa: E402 +version = importlib_metadata.version('labscript') release = version diff --git a/setup.cfg b/setup.cfg index 11408e3..6eb1061 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,7 @@ packages = find: python_requires = >=3.6 install_requires = importlib_metadata - labscript_utils==3.1.0 + labscript_utils>=3.0.0 numpy>=1.15 scipy matplotlib From aadd4766e04fc6600308be06512fbec22c43479c Mon Sep 17 00:00:00 2001 From: David Meyer Date: Fri, 4 Feb 2022 08:51:54 -0500 Subject: [PATCH 7/7] Re-attempt to mock `labscript_utils` import so autosummary can work. --- docs/source/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/conf.py b/docs/source/conf.py index d92c22d..48185f8 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -55,6 +55,7 @@ autodoc_typehints = 'description' autosummary_generate = True add_module_names = False +autodoc_mock_imports = ['labscript_utils'] # Prefix each autosectionlabel with the name of the document it is in and a colon autosectionlabel_prefix_document = True pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy