build: improved organization of requirements

jonrkarr · jonrkarr · commit 3367eabc9523 · 2021-09-25T11:53:47.000-04:00
diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,5 @@
-Dockerfile
-README.md
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md
+GOVERNANCE.md
+LICENSE
+README.md
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs:
             --workdir /home/Biosimulators_tutorials \
             ghcr.io/biosimulators/biosimulators_tutorials:latest \
             -c "
-              pip install nbmake pytest pytest-forked
+              pip install -r requirements.tests.txt
               /bin/bash /xvfb-startup.sh python -m pytest --forked --verbose --nbmake tutorials/
             "
 
diff --git a/Dockerfile b/Dockerfile
@@ -9,15 +9,9 @@ LABEL \
     org.opencontainers.image.authors="BioSimulators Team <info@biosimulators.org>" \
     org.opencontainers.image.vendor="BioSimulators Team"
 
-RUN pip install \
-    notebook \
-    jupyterhub \
-    jupyterlab \
-    matplotlib \
-    pyyaml \
-    requests \
-    kisao
-ENV MPLBACKEND=
+COPY requirements.txt /tmp/requirements.txt
+RUN pip install -r /tmp/requirements.txt \
+    && rm /tmp/requirements.txt
 
 ARG NB_USER=biosimulators
 ARG NB_UID=1000
diff --git a/requirements.tests.txt b/requirements.tests.txt
@@ -0,0 +1,3 @@
+pytest
+nbmake
+pytest-forked
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,10 @@
+# requirements to run Jupyter server
+notebook
+jupyterhub
+jupyterlab
+
+# requirements for notebooks
+kisao
+matplotlib
+pyyaml
+requests

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ jobs:`
`48`	`48`	`--workdir /home/Biosimulators_tutorials \`
`49`	`49`	`ghcr.io/biosimulators/biosimulators_tutorials:latest \`
`50`	`50`	`-c "`
`51`		`- pip install nbmake pytest pytest-forked`
	`51`	`+ pip install -r requirements.tests.txt`
`52`	`52`	`/bin/bash /xvfb-startup.sh python -m pytest --forked --verbose --nbmake tutorials/`
`53`	`53`	`"`
`54`	`54`