RedHatTraining/pyramid.git

parent: 574f16d7 | patch | commit | ignore whitespace

Merge pull request #1469 from Pylons/testing-add-pypy3

Michael Merickel

2014-11-21 f6b30ee045fdf5c63daff1168a47016b8aded919

Merge pull request #1469 from Pylons/testing-add-pypy3

Add support for testing 'pypy3' under Tox / Travis.

3 files modified

	.travis.yml	1 ●●●●● patch \| view \| raw \| blame \| history
	CHANGES.txt	2 ●●●●● patch \| view \| raw \| blame \| history
	tox.ini	2 ●●●●● patch \| view \| raw \| blame \| history

 .travis.yml

@@ -8,6 +8,7 @@
  - TOXENV=py33
  - TOXENV=py34
  - TOXENV=pypy
  - TOXENV=pypy3
  - TOXENV=cover

install:

 CHANGES.txt

@@ -4,6 +4,8 @@
Features
--------

- Added support / testing for 'pypy3' under Tox and Travis.

- Cache busting for static resources has been added and is available via a new
  argument to ``pyramid.config.Configurator.add_static_view``: ``cachebust``.
  See https://github.com/Pylons/pyramid/pull/1380

 tox.ini

@@ -1,6 +1,6 @@
[tox]
envlist = 
    py26,py27,py32,py33,py34,pypy,cover
    py26,py27,py32,py33,py34,pypy,pypy3,cover

[testenv]
commands =

			@@ -8,6 +8,7 @@
			- TOXENV=py33
			- TOXENV=py34
			- TOXENV=pypy
			- TOXENV=pypy3
			- TOXENV=cover

			install:

			@@ -4,6 +4,8 @@
			Features
			--------

			- Added support / testing for 'pypy3' under Tox and Travis.

			- Cache busting for static resources has been added and is available via a new
			argument to ``pyramid.config.Configurator.add_static_view``: ``cachebust``.
			See https://github.com/Pylons/pyramid/pull/1380

			@@ -1,6 +1,6 @@
			[tox]
			envlist =
			py26,py27,py32,py33,py34,pypy,cover
			py26,py27,py32,py33,py34,pypy,pypy3,cover

			[testenv]
			commands =