From e1576082fcec240e1e3904dce3e82f3475c85f12 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Mar 2021 13:38:50 +0000
Subject: [PATCH 1/5] Use local pip requirements.txt

---
 .gitignore    |  3 ++-
 jenkins_build | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc2628c77..fb6f0b0b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,8 @@ manual/source/classes/*/NX*.rst
 manual/source/classes/*/*.nxdl.xml
 manual/source/classes/contributed_definitions/canSAS
 manual/makelog.txt
-build
+/build/
+/python/
 impatient-guide/_build
 .DS_Store
 __github_creds__.txt
diff --git a/jenkins_build b/jenkins_build
index 15e08189f..9626c9355 100755
--- a/jenkins_build
+++ b/jenkins_build
@@ -4,10 +4,16 @@ set -o errexit -x
 # jenkins job name
 job_name="$1"
 
-export PATH=/usr/local/bin:$PATH
-
-# use local python venv
-. /usr/local/python/bin/activate
+#export PATH=/usr/local/bin:$PATH
+
+## install local python virtual environment
+## based on local requirements.txt
+PYDIR=`pwd`/python
+rm -fr "${PYDIR}"
+python -m venv ${PYDIR}
+source $PYDIR/bin/activate
+python -m pip install --upgrade pip
+python -m pip install -r requirements.txt
 
 if test -d build; then
     rm -fr build

From 6c841812bb8e925b231287f643ae68d088202a1d Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Mar 2021 13:42:24 +0000
Subject: [PATCH 2/5] Use local pip requirements.txt

---
 requirements.txt | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 requirements.txt

diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000000000..471bfb77c
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,38 @@
+alabaster
+Babel
+certifi
+chardet
+Deprecated
+docutils
+gitdb
+GitPython
+idna
+imagesize
+Jinja2
+lxml
+MarkupSafe
+numpy
+packaging
+pandas
+plotly
+PyGithub
+Pygments
+PyJWT
+pyparsing
+pyRestTable
+python-dateutil
+pytz
+requests
+retrying
+six
+smmap
+snowballstemmer
+Sphinx
+sphinxcontrib-applehelp
+sphinxcontrib-devhelp
+sphinxcontrib-htmlhelp
+sphinxcontrib-jsmath
+sphinxcontrib-qthelp
+sphinxcontrib-serializinghtml
+urllib3
+wrapt

From 962c3f930ccf37d1eae0b08552d2b94ad4d6524b Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Mar 2021 14:44:25 +0000
Subject: [PATCH 3/5] Make minimal

---
 requirements.txt | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 471bfb77c..3d42b04eb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,38 +1,4 @@
-alabaster
-Babel
-certifi
-chardet
-Deprecated
-docutils
-gitdb
-GitPython
-idna
-imagesize
-Jinja2
 lxml
-MarkupSafe
-numpy
-packaging
-pandas
-plotly
-PyGithub
-Pygments
-PyJWT
-pyparsing
 pyRestTable
-python-dateutil
-pytz
-requests
-retrying
-six
-smmap
-snowballstemmer
 Sphinx
-sphinxcontrib-applehelp
-sphinxcontrib-devhelp
-sphinxcontrib-htmlhelp
-sphinxcontrib-jsmath
-sphinxcontrib-qthelp
-sphinxcontrib-serializinghtml
-urllib3
-wrapt
+six

From f8c8452d9cd1504b20f243579fe1f3fe79057d36 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Mar 2021 14:48:53 +0000
Subject: [PATCH 4/5] Use pip requirements

---
 environment.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/environment.yml b/environment.yml
index 0aafe4823..0fab4faaf 100644
--- a/environment.yml
+++ b/environment.yml
@@ -4,8 +4,6 @@ channels:
   - conda-forge
   - aps-anl-tag
 dependencies:
+  - pip
   - pip:
-    - lxml
-    - pyRestTable
-    - six
-    - sphinx
+    - -r file:requirements.txt

From 0ac3fdc7d45f8a4263a44b708e9a49cb8621bff0 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Tue, 23 Mar 2021 14:53:21 +0000
Subject: [PATCH 5/5] Update syntax

---
 jenkins_build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins_build b/jenkins_build
index 9626c9355..e3e3b0f4e 100755
--- a/jenkins_build
+++ b/jenkins_build
@@ -8,7 +8,7 @@ job_name="$1"
 
 ## install local python virtual environment
 ## based on local requirements.txt
-PYDIR=`pwd`/python
+PYDIR=$(pwd)/python
 rm -fr "${PYDIR}"
 python -m venv ${PYDIR}
 source $PYDIR/bin/activate