summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml30
-rw-r--r--devel-requirements.txt8
-rw-r--r--extra-requirements.txt9
3 files changed, 25 insertions, 22 deletions
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'