Clean up and update depencies to use released versions where possible.

zopefoundation · Jul 11, 2016 · cc1091d · cc1091d
1 parent ccfa110
commit cc1091d
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,13 @@
 *.pyc
 __pycache__
 
+.eggs/
 .installed.cfg
 .tox
 bin
+.coverage*
+coverage.xml
+htmlcov/
 develop-eggs
 dist
 src/*.egg-info/
diff --git a/buildout.cfg b/buildout.cfg
@@ -3,11 +3,7 @@ develop = .
 parts = test py
 versions=versions
 find-links =
-	${buildout:directory}/ZODB-4.0.0dev.tar.gz
-	${buildout:directory}/zope.app.appsetup-4.0.0a1.dev.tar.gz
-	${buildout:directory}/zope.app.http-4.0.0a1.dev.tar.gz
-	${buildout:directory}/zope.app.wsgi-4.0.0a1.dev.tar.gz
-	${buildout:directory}/zope.testbrowser-4.0.3dev.tar.gz
+	${buildout:directory}/zope.app.wsgi-4.0.0a5.dev0.tar.gz
 
 [versions]
 zope.security = >=4.0.0a4
@@ -16,11 +12,9 @@ zope.tal = >= 4.0.0a1
 zope.principalregistry = >=4.0.0a1
 zope.session = >= 4.0.0a1
 
-ZODB=4.0.0dev
-zope.app.appsetup=4.0.0a1.dev
+zope.app.appsetup=4.0.0a1
 zope.app.http=4.0.0a1.dev
-zope.app.wsgi=4.0.0a1.dev
-zope.testbrowser=4.0.3dev
+zope.app.wsgi=4.0.0a5.dev0
 
 
 [test]

diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@ def read(*rnames):
 TEST_REQUIREMENTS =['zope.annotation',
                     'zope.app.appsetup >= 3.14.0',
                     'zope.app.http >= 3.10',
-                    'zope.app.wsgi[testbrowser] <3.11, >= 3.12',
+                    'zope.app.wsgi[testlayer] >= 4.0.0a1',
                     'zope.applicationcontrol>=4.0.0a1',
                     'zope.browserpage',
                     'zope.login',

diff --git a/tox.ini b/tox.ini
@@ -4,13 +4,13 @@ envlist = py26, py27, py33
 [testenv]
 commands =
     zope-testrunner --test-path src
-deps = 
-	{toxinidir}/ZODB-4.0.0dev.tar.gz
-	{toxinidir}/zope.app.appsetup-4.0.0a1.dev.tar.gz
-	{toxinidir}/zope.app.http-4.0.0a1.dev.tar.gz
-	{toxinidir}/zope.app.wsgi-4.0.0a1.dev.tar.gz
-	{toxinidir}/zope.testbrowser-4.0.3dev.tar.gz
+deps =
+    ; zope.app.wsgi[testlayer] >= 4.0.0a5.dev has to be included
+	{toxinidir}/zope.app.wsgi-4.0.0a5.dev0.tar.gz
     six
+    ZODB
+    zope.app.appsetup==4.0.0a1
+    zope.app.http==4.0.0a1.dev
     zope.applicationcontrol>=3.5.0
     zope.browserpage
     zope.login
@@ -21,4 +21,3 @@ deps =
     zope.site
     zope.testing
     zope.testrunner
-	WebTest
diff --git a/zope.app.appsetup-4.0.0a1.dev.tar.gz b/zope.app.appsetup-4.0.0a1.dev.tar.gz
diff --git a/zope.app.http-4.0.0a1.dev.tar.gz b/zope.app.http-4.0.0a1.dev.tar.gz
diff --git a/zope.app.wsgi-4.0.0a1.dev.tar.gz b/zope.app.wsgi-4.0.0a1.dev.tar.gz
diff --git a/zope.app.wsgi-4.0.0a5.dev0.tar.gz b/zope.app.wsgi-4.0.0a5.dev0.tar.gz
diff --git a/zope.testbrowser-4.0.3dev.tar.gz b/zope.testbrowser-4.0.3dev.tar.gz