1*4882a593SmuzhiyunFrom 04b14c4569309f1a433d955773aeb8a3607a1360 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Alistair Francis <alistair.francis@wdc.com> 3*4882a593SmuzhiyunDate: Tue, 19 Mar 2019 13:32:54 -0700 4*4882a593SmuzhiyunSubject: [PATCH 5/7] pip requirements: Don't install requirements with pip 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Alistair Francis <alistair.francis@wdc.com> 7*4882a593SmuzhiyunUpstream-Status: Inappropriate [embedded specific] 8*4882a593Smuzhiyun--- 9*4882a593Smuzhiyun dev_setup.sh | 15 +-------------- 10*4882a593Smuzhiyun requirements.txt | 36 ------------------------------------ 11*4882a593Smuzhiyun test-requirements.txt | 7 ------- 12*4882a593Smuzhiyun 3 files changed, 1 insertion(+), 57 deletions(-) 13*4882a593Smuzhiyun delete mode 100644 requirements.txt 14*4882a593Smuzhiyun delete mode 100644 test-requirements.txt 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/dev_setup.sh b/dev_setup.sh 17*4882a593Smuzhiyunindex 0c8e11b8170..be4a19de0c3 100755 18*4882a593Smuzhiyun--- a/dev_setup.sh 19*4882a593Smuzhiyun+++ b/dev_setup.sh 20*4882a593Smuzhiyun@@ -351,19 +351,6 @@ fi 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))") 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun-# install required python modules 25*4882a593Smuzhiyun-if ! pip install -r requirements.txt ; then 26*4882a593Smuzhiyun- echo 'Warning: Failed to install all requirements. Continue? y/N' 27*4882a593Smuzhiyun- read -n1 continue 28*4882a593Smuzhiyun- if [[ $continue != 'y' ]] ; then 29*4882a593Smuzhiyun- exit 1 30*4882a593Smuzhiyun- fi 31*4882a593Smuzhiyun-fi 32*4882a593Smuzhiyun- 33*4882a593Smuzhiyun-if ! pip install -r test-requirements.txt ; then 34*4882a593Smuzhiyun- echo "Warning test requirements wasn't installed, Note: normal operation should still work fine..." 35*4882a593Smuzhiyun-fi 36*4882a593Smuzhiyun- 37*4882a593Smuzhiyun SYSMEM=$(free | awk '/^Mem:/ { print $2 }') 38*4882a593Smuzhiyun MAXCORES=$(($SYSMEM / 512000)) 39*4882a593Smuzhiyun MINCORES=1 40*4882a593Smuzhiyun@@ -420,4 +407,4 @@ if [[ ! -w /var/log/mycroft/ ]] ; then 41*4882a593Smuzhiyun fi 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun #Store a fingerprint of setup 44*4882a593Smuzhiyun-md5sum requirements.txt test-requirements.txt dev_setup.sh > .installed 45*4882a593Smuzhiyun+md5sum dev_setup.sh > .installed 46*4882a593Smuzhiyundiff --git a/requirements.txt b/requirements.txt 47*4882a593Smuzhiyundeleted file mode 100644 48*4882a593Smuzhiyunindex 0140d5465dc..00000000000 49*4882a593Smuzhiyun--- a/requirements.txt 50*4882a593Smuzhiyun+++ /dev/null 51*4882a593Smuzhiyun@@ -1,36 +0,0 @@ 52*4882a593Smuzhiyun-six==1.10.0 53*4882a593Smuzhiyun-cryptography==2.6.1 54*4882a593Smuzhiyun-requests==2.20.0 55*4882a593Smuzhiyun-gTTS==2.0.3 56*4882a593Smuzhiyun-gTTS-token==1.1.3 57*4882a593Smuzhiyun-PyAudio==0.2.11 58*4882a593Smuzhiyun-pyee==5.0.0 59*4882a593Smuzhiyun-SpeechRecognition==3.8.1 60*4882a593Smuzhiyun-tornado==4.5.3 61*4882a593Smuzhiyun-websocket-client==0.54.0 62*4882a593Smuzhiyun-requests-futures==0.9.5 63*4882a593Smuzhiyun-pyalsaaudio==0.8.2 64*4882a593Smuzhiyun-xmlrunner==1.7.7 65*4882a593Smuzhiyun-pyserial==3.0 66*4882a593Smuzhiyun-psutil==5.2.1 67*4882a593Smuzhiyun-pocketsphinx==0.1.0 68*4882a593Smuzhiyun-inflection==0.3.1 69*4882a593Smuzhiyun-pillow==4.1.1 70*4882a593Smuzhiyun-python-dateutil==2.6.0 71*4882a593Smuzhiyun-pychromecast==3.2.2 72*4882a593Smuzhiyun-python-vlc==1.1.2 73*4882a593Smuzhiyun-google-api-python-client==1.6.4 74*4882a593Smuzhiyun-fasteners==0.14.1 75*4882a593Smuzhiyun-PyYAML==3.13 76*4882a593Smuzhiyun- 77*4882a593Smuzhiyun-msm==0.8.3 78*4882a593Smuzhiyun-msk==0.3.13 79*4882a593Smuzhiyun-adapt-parser==0.3.3 80*4882a593Smuzhiyun-padatious==0.4.6 81*4882a593Smuzhiyun-fann2==1.0.7 82*4882a593Smuzhiyun-padaos==0.1.9 83*4882a593Smuzhiyun-precise-runner==0.2.1 84*4882a593Smuzhiyun-petact==0.1.2 85*4882a593Smuzhiyun- 86*4882a593Smuzhiyun-# dev setup tools 87*4882a593Smuzhiyun-pep8==1.7.0 88*4882a593Smuzhiyundiff --git a/test-requirements.txt b/test-requirements.txt 89*4882a593Smuzhiyundeleted file mode 100644 90*4882a593Smuzhiyunindex fd129e3f66d..00000000000 91*4882a593Smuzhiyun--- a/test-requirements.txt 92*4882a593Smuzhiyun+++ /dev/null 93*4882a593Smuzhiyun@@ -1,7 +0,0 @@ 94*4882a593Smuzhiyun-pycodestyle===2.5.0 95*4882a593Smuzhiyun-coveralls==1.5.0 96*4882a593Smuzhiyun-pytest==3.5.0 97*4882a593Smuzhiyun-pytest-cov==2.5.1 98*4882a593Smuzhiyun-cov-core==1.15.0 99*4882a593Smuzhiyun-sphinx==1.8.2 100*4882a593Smuzhiyun-sphinx-rtd-theme==0.4.2 101*4882a593Smuzhiyun-- 102*4882a593Smuzhiyun2.23.0 103*4882a593Smuzhiyun 104