From 2f8487acdeee6f9ec7b211fadb8e2f59a1ab1912 Mon Sep 17 00:00:00 2001
From: Russell Jarvis <rjjarvis@asu.edu>
Date: Fri, 26 Jun 2020 11:17:22 +1000
Subject: [PATCH] travis
---
.travis.yml | 4 ++--
install/user_install.sh | 16 ++++++++--------
science_access/align_data_sources.py | 17 -----------------
3 files changed, 10 insertions(+), 27 deletions(-)
delete mode 100644 science_access/align_data_sources.py
diff --git a/.travis.yml b/.travis.yml
index 17614bb..de545c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,8 @@ python:
- "3.5"
- "3.7"
install:
- - bash install/install_python3.sh
- - sudo /opt/conda/bin/pip install .
+ - pip install -r requirements.txt
+ - python setup.py install
- bash install/user_install.sh
- python install/align_data_sources.py
script:
diff --git a/install/user_install.sh b/install/user_install.sh
index 40268de..a708b72 100644
--- a/install/user_install.sh
+++ b/install/user_install.sh
@@ -31,14 +31,14 @@ else
exit 1
fi
-which -s pip3
-if [[ $? != 0 ]] ; then
- sudo bash install_python3.sh
-fi
+#which -s pip3
+#if [[ $? != 0 ]] ; then
+# sudo bash install_python3.sh
+#fi
-which -s python3
-if [[ $? != 0 ]] ; then
- sudo bash install_python3.sh
-fi
+#which -s python3
+#if [[ $? != 0 ]] ; then
+# sudo bash install_python3.sh
+#fi
sudo bash install/gecko_install.sh
sudo bash install/part2.sh
diff --git a/science_access/align_data_sources.py b/science_access/align_data_sources.py
deleted file mode 100644
index a792d0c..0000000
--- a/science_access/align_data_sources.py
+++ /dev/null
@@ -1,17 +0,0 @@
-
-import nltk
-try:
- from nltk.corpus import stopwords
- stop_words = stopwords.words('english')
-except:
- nltk.download('punkt')
- nltk.download('stopwords')
-
-if not(os.path.exists('traingDats.p?dl=0') or os.path.exists('data/traingDats.p')):
-
- os.system('wget https://www.dropbox.com/s/3h12l5y2pn49c80/traingDats.p?dl=0')
- os.system('wget https://www.dropbox.com/s/x66zf52himmp5ox/benchmarks.p?dl=0')
-
-if os.path.exists("traingDats.p?dl=0") and not os.path.exists("data/traingDats.p"):
- os.system('mv traingDats.p?dl=0 data/traingDats.p')
- os.system('mv benchmarks.p?dl=0 data/benchmarks.p')
--
GitLab