diff --git a/spk/octoprint/Makefile b/spk/octoprint/Makefile index bc9610ad26d..57280aca9b8 100644 --- a/spk/octoprint/Makefile +++ b/spk/octoprint/Makefile @@ -8,7 +8,7 @@ BETA = 1 BUILD_DEPENDS = cross/python2 cross/setuptools_py2 cross/pip_py2 cross/wheel DEPENDS = cross/$(SPK_NAME) -WHEELS = src/requirements.txt src/requirements-cross.txt +WHEELS = src/requirements.txt SPK_DEPENDS = "python>=2.7.11-15" diff --git a/spk/octoprint/src/requirements-cross.txt b/spk/octoprint/src/requirements-cross.txt deleted file mode 100644 index d794a7162d2..00000000000 --- a/spk/octoprint/src/requirements-cross.txt +++ /dev/null @@ -1,4 +0,0 @@ -netifaces==0.10.4 -regex==2016.03.02 -tornado==4.0.1 -watchdog==0.8.3 diff --git a/spk/octoprint/src/requirements.txt b/spk/octoprint/src/requirements.txt index 0a9666821ea..c71d323058a 100644 --- a/spk/octoprint/src/requirements.txt +++ b/spk/octoprint/src/requirements.txt @@ -14,18 +14,22 @@ itsdangerous==0.24 Jinja2==2.8 Markdown==2.6.2 netaddr==0.7.17 +netifaces==0.10.4 pathtools==0.1.2 pkginfo==1.2.1 pyasn1==0.1.8 pylru==1.0.9 pyserial==2.7 pytz==2015.6 +regex==2016.03.02 requests==2.7.0 rsa==3.2 sarge==0.1.4 semantic-version==2.4.2 sockjs-tornado==1.0.1 speaklater==1.3 +tornado==4.0.1 unidecode==0.04.19 +watchdog==0.8.3 webassets==0.11.1 Werkzeug==0.8.3