Merge pull request #501 from nameko/restrict-eventlet

Restrict eventlet
nameko · Jan 12, 2018 · fb7560e · fb7560e
2 parents f4e5f36 + 864ccd6
commit fb7560e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -92,25 +92,25 @@ matrix:
         distributions: "sdist bdist_wheel"
     - stage: mastereventlet
       python: 2.7
-      env: TOX_ENV=py27-mastereventlet-lib
+      env: TOX_ENV=py27-mastereventlet
     - stage: mastereventlet
       python: 3.4
-      env: TOX_ENV=py34-mastereventlet-lib
+      env: TOX_ENV=py34-mastereventlet
     - stage: mastereventlet
       python: 3.5
-      env: TOX_ENV=py35-mastereventlet-lib
+      env: TOX_ENV=py35-mastereventlet
     - stage: mastereventlet
       python: 3.6
-      env: TOX_ENV=py36-mastereventlet-lib
+      env: TOX_ENV=py36-mastereventlet
     - stage: branchcoverage
       python: 3.6
       env: TOX_ENV=py36-branchcoverage-lib
   fast_finish: true
   allow_failures:
-    - env: TOX_ENV=py27-mastereventlet-lib
-    - env: TOX_ENV=py34-mastereventlet-lib
-    - env: TOX_ENV=py35-mastereventlet-lib
-    - env: TOX_ENV=py36-mastereventlet-lib
+    - env: TOX_ENV=py27-mastereventlet
+    - env: TOX_ENV=py34-mastereventlet
+    - env: TOX_ENV=py35-mastereventlet
+    - env: TOX_ENV=py36-mastereventlet
     - env: TOX_ENV=py36-branchcoverage-lib
 
 script:

diff --git a/CHANGES b/CHANGES
@@ -5,6 +5,12 @@ Here you can see the full list of changes between nameko versions. Versions
 are in form of *headline.major.minor* numbers. Backwards-compatible changes
 increment the minor version number only.
 
+Version 2.8.3
+-------------
+
+Released: 2018-01-12
+
+* Restrict eventlet to <0.22.0 until we're compatible.
 
 Version 2.8.2
 -------------

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
 
 setup(
     name='nameko',
-    version='2.8.2',
+    version='2.8.3',
     description='A microservices framework for Python that lets service '
                 'developers concentrate on application logic and encourages '
                 'testability.',
@@ -21,7 +21,7 @@
     url='http://github.com/nameko/nameko',
     packages=find_packages(exclude=['test', 'test.*']),
     install_requires=[
-        "eventlet>=0.16.1",
+        "eventlet>=0.16.1,<0.22.0",
         "kombu>=3.0.1,<4",
         "mock>=1.2",
         "path.py>=6.2",

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py34,py35,py36}-{oldest,pinned,latest,mastereventlet}-lib, py36-branchcoverage-lib, {py27,py36}-examples, docs, {py27,py36}-static
+envlist = {py27,py34,py35,py36}-{oldest,pinned,latest}-lib, {py27,py34,py35,py36}-mastereventlet, py36-branchcoverage-lib, {py27,py36}-examples, docs, {py27,py36}-static
 skipsdist = True
 
 [testenv]
@@ -36,7 +36,9 @@ setenv =
 whitelist_externals = make
 
 commands =
+    mastereventlet: pip install --editable .[dev]
     mastereventlet: pip install --upgrade https://github.com/eventlet/eventlet/archive/master.zip
+    mastereventlet: make test_lib
 
     static: pip install --editable .[dev]
     static: make imports