diff --git a/docs/history.rst b/docs/history.rst index 07a895e..b909d97 100644 --- a/docs/history.rst +++ b/docs/history.rst @@ -3,6 +3,10 @@ Release History =============== +`0.2.2`_ (23 Jul 2015) +---------------------- +- Fixed requirements management... why is packaging so hard?! + `0.2.1`_ (23 Jul 2015) ---------------------- - Corrected packaging metadata diff --git a/requires/development.txt b/requires/development.txt index d5f342e..778cdf8 100644 --- a/requires/development.txt +++ b/requires/development.txt @@ -1,3 +1,4 @@ +-rinstallation.txt -rtesting.txt sphinx>=1.2,<2 sphinxcontrib-httpdomain>=1.3,<2 diff --git a/requires/testing.txt b/requires/testing.txt index 3f8d1db..f51104e 100644 --- a/requires/testing.txt +++ b/requires/testing.txt @@ -1,2 +1 @@ --rinstallation.txt nose>=1.3.1,<2 diff --git a/setup.py b/setup.py index 2ebc7bb..2acfbca 100755 --- a/setup.py +++ b/setup.py @@ -17,18 +17,16 @@ def read_requirements(filename): if '#' in line: line = line[:line.index('#')] line = line.strip() - if line.startswith('-r'): - line = line[2:].strip() - requirements.extend(read_requirements(filename)) - else: - requirements.append(line) + if line.startswith('-'): + pass + requirements.append(line) except IOError: pass return requirements -requirements = read_requirements('installation') -tests_require = read_requirements('testing') +requirements = read_requirements('installation.txt') +tests_require = read_requirements('testing.txt') setuptools.setup( name='sprockets.http', diff --git a/sprockets/http/__init__.py b/sprockets/http/__init__.py index 8ad3280..957fb15 100644 --- a/sprockets/http/__init__.py +++ b/sprockets/http/__init__.py @@ -1,7 +1,7 @@ import os -version_info = (0, 2, 1) +version_info = (0, 2, 2) __version__ = '.'.join(str(v) for v in version_info)