doc/requirements.in is now layered on requirements.in

molpopgen · Nov 25, 2021 · 104099c · 104099c
1 parent 5bb532f
commit 104099c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/doc/requirements.in b/doc/requirements.in
@@ -1,3 +1,4 @@
+-c ../requirements.in
 jupyter-book
 matplotlib
 msprime>=1.0.1

diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -14,6 +14,7 @@ argon2-cffi==21.1.0
     #   notebook
 attrs==21.2.0
     # via
+    #   -c ../requirements.in
     #   demes
     #   jsonschema
     #   jupyter-cache
@@ -52,6 +53,7 @@ defusedxml==0.7.1
     # via nbconvert
 demes==0.1.2
     # via
+    #   -c ../requirements.in
     #   demesdraw
     #   msprime
 demesdraw @ git+https://github.com/grahamgower/demesdraw
@@ -182,7 +184,9 @@ mdit-py-plugins==0.2.8
 mistune==0.8.4
     # via nbconvert
 msprime==1.0.3
-    # via -r requirements.in
+    # via
+    #   -c ../requirements.in
+    #   -r requirements.in
 myst-nb==0.13.1
     # via jupyter-book
 myst-parser==0.15.2
@@ -222,6 +226,7 @@ notebook==6.4.6
     # via widgetsnbextension
 numpy==1.20.3
     # via
+    #   -c ../requirements.in
     #   demesdraw
     #   matplotlib
     #   msprime
@@ -311,13 +316,17 @@ ruamel.yaml==0.17.17
 ruamel.yaml.clib==0.2.6
     # via ruamel.yaml
 scipy==1.7.3
-    # via demesdraw
+    # via
+    #   -c ../requirements.in
+    #   demesdraw
 send2trash==1.8.0
     # via
     #   jupyter-server
     #   notebook
 setuptools-scm==6.3.2
-    # via matplotlib
+    # via
+    #   -c ../requirements.in
+    #   matplotlib
 six==1.16.0
     # via
     #   bleach
@@ -423,7 +432,9 @@ traitlets==5.1.1
     #   nbformat
     #   notebook
 tskit==0.3.7
-    # via msprime
+    # via
+    #   -c ../requirements.in
+    #   msprime
 typing-extensions==4.0.0
     # via gitpython
 uc-micro-py==1.0.1

diff --git a/requirements.in b/requirements.in
@@ -11,7 +11,7 @@ demes
 # requirements for docs are in docs/requirements.txt
 msprime
 tskit
-setuptools_scm==1.11.1
+setuptools_scm
 pytest
 pytest-xdist
 

diff --git a/requirements.txt b/requirements.txt
@@ -56,7 +56,9 @@ numpy==1.20.3
     #   sparse
     #   tskit
 packaging==21.3
-    # via pytest
+    # via
+    #   pytest
+    #   setuptools-scm
 pathspec==0.9.0
     # via black
 platformdirs==2.4.0
@@ -98,7 +100,7 @@ scipy==1.7.3
     # via
     #   -r requirements.in
     #   sparse
-setuptools_scm==1.11.1
+setuptools-scm==6.3.2
     # via -r requirements.in
 sparse==0.13.0
     # via -r requirements.in
@@ -107,7 +109,9 @@ svgwrite==1.4.1
 toml==0.10.2
     # via pytest
 tomli==1.2.2
-    # via black
+    # via
+    #   black
+    #   setuptools-scm
 tskit==0.3.7
     # via
     #   -r requirements.in