Merge pull request #61 from macisamuele/maci-fix-build

Fix broken build
Yelp · Jan 8, 2020 · c51e289 · c51e289
2 parents 10ac95e + da34490
commit c51e289
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,11 @@
 language: python
 
+python:
+  - "2.7"
+  - "3.4"
+
 env:
-  - TOXENV=py27
-  - TOXENV=py34
+  - TOXENV=py
 
 install:
   - pip install tox coveralls
@@ -13,5 +16,3 @@ script:
 after_success:
   - tox -e cover
   - coveralls
-
-sudo: false
diff --git a/setup.py b/setup.py
@@ -28,12 +28,12 @@
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.4",
     ],
     install_requires=[
         'crochet',
         'six',
-        'twisted >= 14.0.0',
         'yelp_bytes',
     ],
     extras_require={
@@ -44,7 +44,14 @@
             'pyOpenSSL >= 16.0.0',
             'service-identity',
             'idna >= 0.6, != 2.3',
-        ]
+        ],
+
+        # Defining twisted dependency here to allow twisted
+        # requirement constraint defined by python_version
+        '': ['twisted >= 14.0.0'],
+        # Twisted>=17 does support only python 2.7 and 3.5+
+        ':python_version=="3.3"': ['twisted < 17.0.0'],
+        ':python_version=="3.4"': ['twisted < 17.0.0'],
     },
     license=about['__license__'],
 )