Skip to content
Browse files

Merge branch 'master' of github.com:Pylons/pyramid_beaker

  • Loading branch information...
2 parents 6796404 + 8488868 commit ede1a141305c1c353416b7ca76f2b009d1967dfb @mcdonc mcdonc committed Jul 10, 2012
Showing with 9 additions and 22 deletions.
  1. +8 −0 CHANGES.txt
  2. +0 −1 setup.py
  3. +1 −21 tox.ini
View
8 CHANGES.txt
@@ -1,3 +1,11 @@
+0.7 (unreleased)
+----------------
+
+- Dropped Jython support (may be re-added after Jython releases a 2.7-
+ compatible version).
+
+- Dropped Python 2.5 support.
+
0.6.1 (2011-11-19)
------------------
View
1 setup.py
@@ -40,7 +40,6 @@
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.2",
"Programming Language :: Python :: Implementation :: CPython",
- "Programming Language :: Python :: Implementation :: Jython",
"Programming Language :: Python :: Implementation :: PyPy",
"Framework :: Pyramid",
],
View
22 tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
- py25,py26,py27,py32,pypy,jython,cover
+ py26,py27,py32,pypy,cover
[testenv]
commands =
@@ -9,26 +9,6 @@ deps =
pyramid
beaker
-[testenv:jython]
-commands =
- jython setup.py test -q
-deps =
- zope.interface < 4.0dev
- zope.component < 4.0dev
- https://github.com/Pylons/webob/zipball/1.1-branch
- https://github.com/Pylons/pyramid/zipball/1.2-branch
- beaker
-
-[testenv:py25]
-commands =
- python setup.py test -q
-deps =
- zope.interface < 4.0dev
- zope.component < 4.0dev
- https://github.com/Pylons/webob/zipball/1.1-branch
- https://github.com/Pylons/pyramid/zipball/1.2-branch
- beaker
-
[testenv:cover]
basepython =
python2.6

0 comments on commit ede1a14

Please sign in to comment.
Something went wrong with that request. Please try again.