From 3787cb5e98adb134b68d83d8a076c6adda01b8ff Mon Sep 17 00:00:00 2001 From: Brian Johnson Date: Wed, 5 Aug 2020 11:26:54 -0700 Subject: [PATCH 1/4] Update build.sh Fixing some build issues. --- .jenkins/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.jenkins/build.sh b/.jenkins/build.sh index 95ad25d52da..77452f882c0 100755 --- a/.jenkins/build.sh +++ b/.jenkins/build.sh @@ -15,8 +15,8 @@ export PATH=/opt/conda/bin:$PATH rm -rf src pip install -r $DIR/../requirements.txt -export PATH=/opt/conda/bin:$PATH -pip install sphinx==1.8.2 pandas +# export PATH=/opt/conda/bin:$PATH +# pip install sphinx==1.8.2 pandas # For Tensorboard. Until 1.14 moves to the release channel. pip install tb-nightly From 77988f23395207d6ab29f0838c799a6f01b6ba3a Mon Sep 17 00:00:00 2001 From: Brian Johnson Date: Wed, 5 Aug 2020 11:27:36 -0700 Subject: [PATCH 2/4] Update requirements.txt Continue build fix. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index af5eec5392b..a0aca3ca028 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ # Refer to ./jenkins/build.sh for tutorial build instructions -sphinx +sphinx==1.8.2 sphinx-gallery==0.3.1 tqdm numpy From 2e3e1dabff91bf991ad6437ded9228e51207d78a Mon Sep 17 00:00:00 2001 From: Brian Johnson Date: Wed, 5 Aug 2020 11:52:46 -0700 Subject: [PATCH 3/4] Update build.sh Testing upgrade option --- .jenkins/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jenkins/build.sh b/.jenkins/build.sh index 77452f882c0..b34a863173f 100755 --- a/.jenkins/build.sh +++ b/.jenkins/build.sh @@ -13,7 +13,7 @@ sudo apt-get install -y --no-install-recommends unzip p7zip-full sox libsox-dev export PATH=/opt/conda/bin:$PATH rm -rf src -pip install -r $DIR/../requirements.txt +pip install -r -U $DIR/../requirements.txt # export PATH=/opt/conda/bin:$PATH # pip install sphinx==1.8.2 pandas From 51d704874fcc6b341c50398cd4eec8da266b8ff8 Mon Sep 17 00:00:00 2001 From: Brian Johnson Date: Wed, 5 Aug 2020 12:01:33 -0700 Subject: [PATCH 4/4] Update build.sh --- .jenkins/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jenkins/build.sh b/.jenkins/build.sh index b34a863173f..77452f882c0 100755 --- a/.jenkins/build.sh +++ b/.jenkins/build.sh @@ -13,7 +13,7 @@ sudo apt-get install -y --no-install-recommends unzip p7zip-full sox libsox-dev export PATH=/opt/conda/bin:$PATH rm -rf src -pip install -r -U $DIR/../requirements.txt +pip install -r $DIR/../requirements.txt # export PATH=/opt/conda/bin:$PATH # pip install sphinx==1.8.2 pandas