Skip to content

Commit

Permalink
Merge pull request #3 from sprockets/fix-req-installation
Browse files Browse the repository at this point in the history
Fix requirements
  • Loading branch information
dave-shawley committed Sep 10, 2015
2 parents 4cba9d6 + 6353f4f commit ebf8fe4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
10 changes: 10 additions & 0 deletions docs/history.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Version History
===============

`1.0.3`_ (10 Sep 2015)
---------------------
- Update installation files

`1.0.2`_ (9 Sep 2015)
---------------------
- Rename package to mediatype

`1.0.1`_ (9 Sep 2015)
---------------------
- Repackaged for Travis-CI configuration.
Expand All @@ -9,5 +17,7 @@ Version History
---------------------
- Initial Release

.. _1.0.3: https://github.com/sprockets/sprockets.http/compare/1.0.2...1.0.3
.. _1.0.2: https://github.com/sprockets/sprockets.http/compare/1.0.1...1.0.2
.. _1.0.1: https://github.com/sprockets/sprockets.http/compare/1.0.0...1.0.1
.. _1.0.0: https://github.com/sprockets/sprockets.http/compare/0.0.0...1.0.0
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@ def read_requirements(file_name):
return requirements


install_requires = read_requirements('install.txt')
setup_requires = read_requirements('setup.txt')
install_requires = read_requirements('installation.txt')
tests_require = read_requirements('testing.txt')

setuptools.setup(
name='sprockets.mixins.mediatype',
version='1.0.2',
version='1.0.3',
description='A mixin for reporting handling content-type/accept headers',
long_description='\n' + open('README.rst').read(),
url='https://github.com/sprockets/sprockets.mixins.media_type',
Expand All @@ -56,7 +55,6 @@ def read_requirements(file_name):
],
packages=setuptools.find_packages(),
install_requires=install_requires,
setup_requires=setup_requires,
tests_require=tests_require,
namespace_packages=['sprockets', 'sprockets.mixins'],
test_suite='nose.collector',
Expand Down
2 changes: 1 addition & 1 deletion sprockets/mixins/mediatype.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from tornado import escape, web


version_info = (1, 0, 2)
version_info = (1, 0, 3)
__version__ = '.'.join(str(v) for v in version_info)
logger = logging.getLogger(__name__)

Expand Down

0 comments on commit ebf8fe4

Please sign in to comment.