From 5242b3f15d7dd359ccb067a818c64f78a58d9eaa Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Thu, 23 Mar 2017 11:46:47 -0700
Subject: [PATCH 1/3] chore: kill these to preserve history

following commit renames the base req files to these
---
 requirements.txt      | 2 --
 test-requirements.txt | 2 --
 2 files changed, 4 deletions(-)
 delete mode 100644 requirements.txt
 delete mode 100644 test-requirements.txt

diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 703a8ac6..00000000
--- a/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r base-requirements.txt
-wsaccel==0.6.2
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 2fbac03f..00000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r requirements.txt
--r base-test-requirements.txt

From edf927b63be9959f182d7dafd0a327b3c893501e Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Thu, 23 Mar 2017 11:47:34 -0700
Subject: [PATCH 2/3] chore: kill the base requirements

---
 doc-requirements.txt                                | 2 +-
 base-requirements.txt => requirements.txt           | 0
 base-test-requirements.txt => test-requirements.txt | 0
 tox.ini                                             | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename base-requirements.txt => requirements.txt (100%)
 rename base-test-requirements.txt => test-requirements.txt (100%)

diff --git a/doc-requirements.txt b/doc-requirements.txt
index 36de3d70..338a9002 100644
--- a/doc-requirements.txt
+++ b/doc-requirements.txt
@@ -1,3 +1,3 @@
--r base-requirements.txt
+-r requirements.txt
 sphinx>=1.3.1
 sphinxcontrib-httpdomain>=1.3.0
diff --git a/base-requirements.txt b/requirements.txt
similarity index 100%
rename from base-requirements.txt
rename to requirements.txt
diff --git a/base-test-requirements.txt b/test-requirements.txt
similarity index 100%
rename from base-test-requirements.txt
rename to test-requirements.txt
diff --git a/tox.ini b/tox.ini
index ea7cad13..cf12bc1c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ setenv = with_gmp=no
 
 [testenv:flake8]
 commands = flake8 autopush
-deps = -rbase-test-requirements.txt
+deps = flake8
 
 [testenv:py36-mypy]
 commands = mypy autopush

From b0a5983ef9678849bac53bb3c600b955b0df296b Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Thu, 23 Mar 2017 11:50:08 -0700
Subject: [PATCH 3/3] chore: utilize PEP 426 env markers

so we no longer need pypy specific req files

fixes #848
---
 Dockerfile                 | 2 +-
 Makefile                   | 4 +---
 pypy-requirements.txt      | 1 -
 pypy-test-requirements.txt | 2 --
 requirements.txt           | 1 +
 test-requirements.txt      | 1 +
 tox.ini                    | 1 -
 7 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 pypy-requirements.txt
 delete mode 100644 pypy-test-requirements.txt

diff --git a/Dockerfile b/Dockerfile
index a97f69df..45c42c6e 100644
--- 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
index e465694b..2381da74 100644
--- 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
deleted file mode 100644
index d96295ca..00000000
--- a/pypy-requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
--r base-requirements.txt
diff --git a/pypy-test-requirements.txt b/pypy-test-requirements.txt
deleted file mode 100644
index c4df4bae..00000000
--- a/pypy-test-requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r pypy-requirements.txt
--r base-test-requirements.txt
diff --git a/requirements.txt b/requirements.txt
index 8a96b1cd..77c90a21 100644
--- 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
index 9e8a5ef6..c546e86a 100644
--- 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
index cf12bc1c..629eaf6c 100644
--- 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