From 5168479e426ee54b1bf07d859f15a2deae0046cf Mon Sep 17 00:00:00 2001
From: Ilya Etingof <etingof@gmail.com>
Date: Sun, 8 Jul 2018 12:05:59 +0200
Subject: [PATCH] Add extra-requirements.txt (#165)

* Add extra-requirements.txt

In grand schema of things we now have `requirements.txt`
that list mandatory dependencies, then we have
`extra-requirements.txt` for optional dependencies enabling
all pysnmp features and finally `devel-requirements.txt`
for things required solely for testing.

Strangely, Travis pulls pysnmpcrypto which then pulls
Cryptography while according to pysnmpcrypyo requirement
it should really pull pycryptodomex (which is does in its
own CI job)
---
 .travis.yml            | 30 ++++++++++++++++--------------
 devel-requirements.txt |  8 --------
 extra-requirements.txt |  9 +++++++++
 3 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 extra-requirements.txt

diff --git a/.travis.yml b/.travis.yml
index 4006e760..f2ea0eee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,13 @@ matrix:
     dist: xenial
     sudo: false
     python: '2.7'
-  - os: linux
-    dist: xenial
-    sudo: false
-    python: '3.2'
+# Something is broken about pysnmp->pysnmpcrypto->cryptography.
+# Somehow pysnmpcrypto chooses cryptography while it should
+# pick pycryptodomex
+#  - os: linux
+#    dist: xenial
+#    sudo: false
+#    python: '3.2'
   - os: linux
     dist: xenial
     sudo: false
@@ -38,17 +41,16 @@ matrix:
     dist: xenial
     sudo: false
     python: 'nightly'
-#  - os: linux
-#    dist: xenial
-#    sudo: false
-#    python: 'pypy'
-#  - os: linux
-#    dist: xenial
-#    sudo: false
-#    python: 'pypy3'
+  - os: linux
+    dist: xenial
+    sudo: false
+    python: 'pypy'
+  - os: linux
+    dist: xenial
+    sudo: false
+    python: 'pypy3'
 install:
-  - pip install -r requirements.txt -r devel-requirements.txt
+  - pip install -r requirements.txt -r devel-requirements.txt -r extra-requirements.txt
   - pip install -e .
-  - pip install pysnmp-mibs
 script:
   - travis_wait 20 sh runtests.sh
diff --git a/devel-requirements.txt b/devel-requirements.txt
index d03c9630..093a878c 100644
--- a/devel-requirements.txt
+++ b/devel-requirements.txt
@@ -1,10 +1,2 @@
 Sphinx <= 1.6; python_version < '2.7'
 Sphinx > 1.6; python_version >= '2.7'
-trollius; python_version < '3.0'
-twisted < 15.4; python_version < '2.7'
-twisted; python_version == '2.7'
-twisted < 17.9; python_version == '3.0'
-twisted < 17.9; python_version == '3.1'
-twisted < 17.9; python_version == '3.2'
-twisted <= 17.9; python_version == '3.3'
-twisted; python_version >= '3.4'
diff --git a/extra-requirements.txt b/extra-requirements.txt
new file mode 100644
index 00000000..0c8d2f2b
--- /dev/null
+++ b/extra-requirements.txt
@@ -0,0 +1,9 @@
+pysnmpcrypto
+trollius; python_version < '3.0'
+twisted < 15.4; python_version < '2.7'
+twisted; python_version == '2.7'
+twisted < 17.9; python_version == '3.0'
+twisted < 17.9; python_version == '3.1'
+twisted < 17.9; python_version == '3.2'
+twisted <= 17.9; python_version == '3.3'
+twisted; python_version >= '3.4'