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