Cleaner, simplified requirements expressions

Test, style are expressed separately.
No longer a need for -tox specific requirements.
Separate folder for requirements files.

Docker-DCO-1.1-Signed-off-by: Mangled Deutz <[email protected]> (github: dmp42)

Author: Mangled Deutz

.travis.yml

@@ -7,13 +7,13 @@ python:
 install:
 ## This below should be separated when core lives elsewhere
 # Install core tests reqs
-  - pip install -rdepends/docker-registry-core/tests/requirements-tests.txt
-  - pip install -rdepends/docker-registry-core/tests/requirements-style.txt
+  - pip install -rdepends/docker-registry-core/requirements/test.txt
+  - pip install -rdepends/docker-registry-core/requirements/style.txt
 # Install core itself
   - pip install depends/docker-registry-core/
 
 # Install our tests requirements, and ourselves
-  - pip install -rtests/requirements.txt
+  - pip install -rrequirements/test.txt
   - pip install .
 
 # XXX should run the core tests as well

MANIFEST.in

@@ -1,4 +1,5 @@
-include requirements.txt
-include tests/requirements.txt
+include requirements/main.txt
+include requirements/test.txt
+include requirements/style.txt
 include README.md
 include LICENSE

depends/docker-registry-core/.travis.yml

@@ -7,8 +7,8 @@ python:
   - "3.4"
 
 install:
-  - pip install -rtests/requirements-test.txt
-  - pip install -rtests/requirements-style.txt
+  - pip install -rrequirements/test.txt
+  - pip install -rrequirements/style.txt
   - pip install .
 
 script: flake8 . && python setup.py nosetests

depends/docker-registry-core/MANIFEST.in

@@ -1,5 +1,5 @@
-include requirements.txt
-include tests/requirements-tests.txt
-include tests/requirements-style.txt
+include requirements/main.txt
+include requirements/test.txt
+include requirements/style.txt
 include README.md
 include LICENSE

depends/docker-registry-core/requirements.txt renamed to depends/docker-registry-core/requirements/main.txt

@@ -22,12 +22,12 @@
 
 import sys
 
-from docker_registry import core  # noqa
+import docker_registry.core as core
 
 if sys.version_info < (2, 6):
     raise Exception("Docker registry requires Python 2.6 or higher.")
 
-requirements_txt = open('./requirements.txt')
+requirements_txt = open('./requirements/main.txt')
 requirements = [line for line in requirements_txt]
 
 ver = sys.version_info
@@ -45,7 +45,8 @@
     author_email=core.__email__,
     maintainer=core.__maintainer__,
     maintainer_email=core.__email__,
-    url='https://github.com/dotclout/docker-registry',
+    keywords="docker registry core",
+    url='https://github.com/dotcloud/docker-registry',
     description="Docker registry core package",
     long_description=open('./README.md').read(),
     # download_url=d,
@@ -72,8 +73,6 @@
               'docker_registry.drivers', 'docker_registry.testing'],
     install_requires=requirements,
     zip_safe=True,
-    tests_require="%s\n%s" % (
-        open('./tests/requirements-tests.txt').read(),
-        open('./tests/requirements-style.txt').read()),
+    tests_require=open('./requirements/test.txt').read(),
     test_suite='nose.collector'
 )

depends/docker-registry-core/tests/requirements-style.txt renamed to depends/docker-registry-core/requirements/style.txt

@@ -9,10 +9,10 @@ exclude     = .tox,.git,*.egg,build
 ignore = H304
 
 [testenv]
-deps        = -rrequirements.txt
-              -rtests/requirements-tests.txt
+deps        = -rrequirements/main.txt
+              -rrequirements/test.txt
 commands    = python setup.py nosetests
 
 [testenv:flake8]
-deps        = -rtests/requirements-style.txt
+deps        = -rrequirements/style.txt
 commands    = flake8 {toxinidir}