chore: utilize PEP 426 env markers

so we no longer need pypy specific req files fixes #848
mozilla-services · Mar 23, 2017 · b0a5983 · b0a5983
1 parent edf927b
commit b0a5983
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN \
     apt-get update && \
     apt-get install -y -qq libexpat1-dev gcc libssl-dev libffi-dev && \
     make clean && \
-    pip install -r pypy-requirements.txt && \
+    pip install -r requirements.txt && \
     pypy setup.py develop
 
 CMD ["autopush"]
diff --git a/Makefile b/Makefile
@@ -3,12 +3,10 @@ APPNAME = autopush
 DEPS =
 HERE = $(shell pwd)
 PTYPE=pypy
+REQS=requirements.txt
 ifneq ($(PTYPE), python)
-    REQS=$(PTYPE)-requirements.txt
     # avoids pycrypto build issues w/ pypy + libgmp-dev or libmpir-dev
     export with_gmp=no
-else
-    REQS=requirements.txt
 endif
 BIN = $(HERE)/$(PTYPE)/bin
 VIRTUALENV = virtualenv

diff --git a/pypy-requirements.txt b/pypy-requirements.txt
diff --git a/pypy-test-requirements.txt b/pypy-test-requirements.txt
diff --git a/requirements.txt b/requirements.txt
@@ -43,3 +43,4 @@ typing==3.5.2.2
 txaio==2.5.1
 ua_parser==0.7.1
 zope.interface==4.3.1
+wsaccel==0.6.2 ; platform_python_implementation == 'CPython'
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,3 +1,4 @@
+-r requirements.txt
 nose
 coverage
 mock>=1.0.1

diff --git a/tox.ini b/tox.ini
@@ -11,7 +11,6 @@ install_command = pip install --pre {opts} {packages}
 
 [testenv:pypy]
 basepython = pypy
-deps = -rpypy-test-requirements.txt
 # avoids pycrypto build issues w/ pypy + libgmp-dev or libmpir-dev
 setenv = with_gmp=no