diff --git a/.travis.yml b/.travis.yml index 17614bb56354f1824c8a3b372cdb1435ae09da36..de545c835443d52ac75c6025d52665638c0f7563 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 40268deca8cf532dea88466b4229de2763374174..a708b72b8535f8dfa07d1e4f5a3a544ab7b1c7a8 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 a792d0cc8ed06f58a84704d3138b0d8e9f5e841f..0000000000000000000000000000000000000000 --- 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')