Move requirements files

Add support for Tornado 6
This commit is contained in:
Robin Klingsberg 2019-03-16 16:06:41 -04:00
parent eb62c18faf
commit 0081582081
10 changed files with 26 additions and 14 deletions

View file

@ -6,7 +6,7 @@ python:
- 3.7
install:
- pip install -e .
- pip install -r test-requirements.txt
- pip install -r requires/testing.txt
- pip install tornado
script: nosetests
after_success:

View file

@ -1,6 +1,11 @@
Version History
---------------
`2.0.1`_ (18-Mar-2019)
~~~~~~~~~~~~~~~~~~~~~~
- Add support for Tornado 6
- Move requirements files to requires/
`2.0.0`_ (26-Nov-2018)
~~~~~~~~~~~~~~~~~~~~~~
- Drop support for Python 2.7, 3.3, 3.4
@ -15,6 +20,7 @@ Version History
~~~~~~~~~~~~~~~~~~~~~~
- Adds ``sprockets.mixins.correlation.HandlerMixin``
.. _`2.0.1`: https://github.com/sprockets/sprockets.mixins.correlation/compare/2.0.0...2.0.1
.. _`2.0.0`: https://github.com/sprockets/sprockets.mixins.correlation/compare/1.0.2...2.0.0
.. _`1.0.2`: https://github.com/sprockets/sprockets.mixins.correlation/compare/1.0.1...1.0.2
.. _`1.0.1`: https://github.com/sprockets/sprockets.mixins.correlation/compare/0.0.0...1.0.1

View file

@ -1,5 +0,0 @@
-r requirements.txt
-r test-requirements.txt
flake8
sphinx>=1.2,<2
sphinx-rtd-theme>=0.1,<1.0

View file

@ -1 +0,0 @@
tornado>=4.0,<5.2

6
requires/development.txt Normal file
View file

@ -0,0 +1,6 @@
-r requires/installation.txt
-r requires/testing.txt
flake8
sphinx>=1.2,<2
sphinx-rtd-theme>=0.1,<1.0

View file

@ -0,0 +1 @@
tornado>=4.0,<6.1

View file

@ -51,8 +51,8 @@ setuptools.setup(
],
packages=setuptools.find_packages(),
namespace_packages=['sprockets'],
install_requires=read_requirements('requirements.txt'),
tests_require=read_requirements('test-requirements.txt'),
install_requires=read_requirements('installation.txt'),
tests_require=read_requirements('testing.txt'),
test_suite='nose.collector',
zip_safe=True,
)

View file

@ -7,5 +7,5 @@ except ImportError:
raise ImportError
version_info = (2, 0, 0)
version_info = (2, 0, 1)
__version__ = '.'.join(str(v) for v in version_info[:3])

13
tox.ini
View file

@ -1,20 +1,25 @@
[tox]
envlist = py35,py36,py37,tornado43,torando51
envlist = py35,py36,py37,tornado43,torando51,tornado6
toxworkdir = {toxinidir}/build/tox
skip_missing_intepreters = true
[testenv]
deps =
-rtest-requirements.txt
-r requires/testing.txt
tornado
commands = {envbindir}/nosetests
[testenv:tornado43]
deps =
-rtest-requirements.txt
-r requires/testing.txt
tornado>=4.3,<4.4
[testenv:tornado51]
deps =
-rtest-requirements.txt
-r requires/testing.txt
tornado>=5.1,<5.2
[testenv:tornado6]
deps =
-r requires/testing.txt
tornado>=6,<6.1