Commit b1da80e1 authored by Patrik Dufresne's avatar Patrik Dufresne

Merge branch 'develop/cherrypy16' into 'master'

Add support for cherrypy 16

See merge request pdsl/minarca-plugins!2
parents 7c56eadf aa074ac8
Pipeline #389 passed with stages
in 18 minutes and 7 seconds
......@@ -151,7 +151,7 @@ setuptools.setup(
'build_less': build_less,
},
install_requires=[
"rdiffweb>=0.10.5",
"rdiffweb>=0.10.8",
"requests",
],
# required packages for build process
......@@ -159,7 +159,7 @@ setuptools.setup(
"babel>=0.9",
"setuptools_scm",
# This is required to compile with lessc.
"rdiffweb>=0.10.5",
"rdiffweb>=0.10.8",
],
# requirement for testing
tests_require=[
......
......@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
[tox]
envlist = py{27,3}-cherrypy{35,4,5,6,7,8,9,10,11,12,13,14},py27-cherrypy32
envlist = py{27,3}-cherrypy{35,4,5,6,7,8,9,10,11,12,13,14,15,16},py27-cherrypy32
[testenv]
deps=
......@@ -35,4 +35,6 @@ deps=
cherrypy12: cherrypy>=12.0.0,<13.0.0
cherrypy13: cherrypy>=13.0.0,<14.0.0
cherrypy14: cherrypy>=14.0.0,<15.0.0
cherrypy15: cherrypy>=15.0.0,<16.0.0
cherrypy16: cherrypy>=16.0.0,<17.0.0
commands=python setup.py nosetests --xunit-file=nosetests-{envname}.xml --xunit-testsuite-name={envname}
......@@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
[tox]
envlist = py{27,3}-cherrypy{35,4,5,6,7,8,9,10,11,12,13,14},py27-cherrypy32
envlist = py{27,3}-cherrypy{35,4,5,6,7,8,9,10,11,12,13,14,15,16},py27-cherrypy32
[testenv]
deps=
......@@ -35,4 +35,6 @@ deps=
cherrypy12: cherrypy>=12.0.0,<13.0.0
cherrypy13: cherrypy>=13.0.0,<14.0.0
cherrypy14: cherrypy>=14.0.0,<15.0.0
cherrypy15: cherrypy>=15.0.0,<16.0.0
cherrypy16: cherrypy>=16.0.0,<17.0.0
commands=python setup.py nosetests --xunit-file=nosetests-{envname}.xml --xunit-testsuite-name={envname} --cover-xml-file=coverage-{envname}.xml
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment