From 65fde288a38e5dbe04d207715863e327f651dece Mon Sep 17 00:00:00 2001 From: Jonathan Bloedow Date: Wed, 13 Dec 2023 11:26:39 -0800 Subject: [PATCH 1/2] Changing setup.py to point to requirements_2018.txt seems to make something in RTD land unhappy. Since we're using the 2018 model for the meantime, let's just make the 'ideal' requirements.txt the one with the funny name and make what was _2018 the one with the standard name, and see what happens. (#36) Co-authored-by: Jonathan Bloedow --- requirements.txt | 5 +++-- requirements_2018.txt | 3 --- requirements_future.txt | 2 ++ setup.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 requirements_2018.txt create mode 100644 requirements_future.txt diff --git a/requirements.txt b/requirements.txt index 25bfa20..3946a35 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ -emodpy~=1.16 -emod-typhoid +emodpy==1.22.0.dev3 +emod-api==1.31.0.dev1 +emod-typhoid==0.0.5 diff --git a/requirements_2018.txt b/requirements_2018.txt deleted file mode 100644 index 3946a35..0000000 --- a/requirements_2018.txt +++ /dev/null @@ -1,3 +0,0 @@ -emodpy==1.22.0.dev3 -emod-api==1.31.0.dev1 -emod-typhoid==0.0.5 diff --git a/requirements_future.txt b/requirements_future.txt new file mode 100644 index 0000000..25bfa20 --- /dev/null +++ b/requirements_future.txt @@ -0,0 +1,2 @@ +emodpy~=1.16 +emod-typhoid diff --git a/setup.py b/setup.py index 50057af..40f19ac 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ long_description = fh.read() ext_name = "emodpy_typhoid" -with open('requirements_2018.txt') as requirements_file: +with open('requirements.txt') as requirements_file: requirements = requirements_file.read().split("\n") setuptools.setup( From 5bd157f372c2d46e4b5c9c1e1f3a9935b9014b9c Mon Sep 17 00:00:00 2001 From: Jen Schripsema Date: Wed, 13 Dec 2023 14:13:00 -0800 Subject: [PATCH 2/2] changed default search behavior to search only across this doc project (#28) Co-authored-by: Jen Schripsema --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index df7d08e..1eb025b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -291,7 +291,7 @@ search_project = os.environ["READTHEDOCS_PROJECT"] search_version = os.environ["READTHEDOCS_VERSION"] - rtd_sphinx_search_default_filter = f"subprojects:{search_project_parent}/{search_version}" + rtd_sphinx_search_default_filter = f"subprojects:{search_project}/{search_version}" rtd_sphinx_search_filters = { "Search this project": f"project:{search_project}/{search_version}",