Merge branch 'main' into AgeBaseHINT_test

# Conflicts: # requirements_2018.txt
InstituteforDiseaseModeling · Jan 3, 2024 · 7fd1412 · 7fd1412
2 parents 8b519d5 + 5bd157f
commit 7fd1412
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git 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}",

diff --git 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.dev4
+emod-typhoid==0.0.7.dev3
diff --git a/requirements_future.txt b/requirements_future.txt
@@ -0,0 +1,2 @@
+emodpy~=1.16
+emod-typhoid
diff --git 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(