blob: 7f63ea13de471588f7046f66d83e640262324499 [file] [log] [blame]
Brad Bishop2d39a062019-10-28 08:33:36 -04001From 04b14c4569309f1a433d955773aeb8a3607a1360 Mon Sep 17 00:00:00 2001
Brad Bishop6a62e0e2019-10-21 08:11:42 -04002From: Alistair Francis <alistair.francis@wdc.com>
3Date: Tue, 19 Mar 2019 13:32:54 -0700
Brad Bishop2d39a062019-10-28 08:33:36 -04004Subject: [PATCH 5/7] pip requirements: Don't install requirements with pip
Brad Bishop6a62e0e2019-10-21 08:11:42 -04005
6Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
7Upstream-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
16diff --git a/dev_setup.sh b/dev_setup.sh
Brad Bishop2d39a062019-10-28 08:33:36 -040017index 0c8e11b8170..be4a19de0c3 100755
Brad Bishop6a62e0e2019-10-21 08:11:42 -040018--- a/dev_setup.sh
19+++ b/dev_setup.sh
Brad Bishop2d39a062019-10-28 08:33:36 -040020@@ -351,19 +351,6 @@ fi
Brad Bishop6a62e0e2019-10-21 08:11:42 -040021
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
Brad Bishop2d39a062019-10-28 08:33:36 -040040@@ -420,4 +407,4 @@ if [[ ! -w /var/log/mycroft/ ]] ; then
Brad Bishop6a62e0e2019-10-21 08:11:42 -040041 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
46diff --git a/requirements.txt b/requirements.txt
47deleted file mode 100644
48index 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
88diff --git a/test-requirements.txt b/test-requirements.txt
89deleted file mode 100644
90index 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--
1022.23.0
103