Merge pull request #3 from sprockets/more-packaging-woes

More packaging woes

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

requires/development.txt

@@ -1,3 +1,4 @@
+-rinstallation.txt
 -rtesting.txt
 sphinx>=1.2,<2
 sphinxcontrib-httpdomain>=1.3,<2

requires/testing.txt

@@ -1,2 +1 @@
--rinstallation.txt
 nose>=1.3.1,<2

setup.py

@@ -17,18 +17,16 @@ def read_requirements(filename):
                 if '#' in line:
                     line = line[:line.index('#')]
                 line = line.strip()
-                if line.startswith('-r'):
+                if line.startswith('-'):
-                    line = line[2:].strip()
+                    pass
-                    requirements.extend(read_requirements(filename))
+                requirements.append(line)
-                else:
-                    requirements.append(line)
     except IOError:
         pass
     return requirements
 
 
-requirements = read_requirements('installation')
+requirements = read_requirements('installation.txt')
-tests_require = read_requirements('testing')
+tests_require = read_requirements('testing.txt')
 
 setuptools.setup(
     name='sprockets.http',

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)