Entirely trivial cleanup

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

Author: Mangled Deutz

.travis.yml

@@ -22,5 +22,3 @@ script: SETTINGS_FLAVOR=test DOCKER_REGISTRY_CONFIG=config_sample.yml flake8 . &
 before_install:
   - sudo apt-get update
   - sudo apt-get install libevent-dev liblzma-dev
-
-# build-essential python-dev

depends/docker-registry-core/setup.cfg

@@ -7,7 +7,3 @@ cover-package=docker_registry
 cover-erase=1
 cover-html=1
 cover-html-dir=reports
-
-[flake8]
-ignore = H304
-exclude = .tox,.git,*.egg,build

depends/docker-registry-core/tests/test_driver.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from docker_registry import testing
+import docker_registry.testing as testing
 
 
 class TestQueryDumb(testing.Query):

docker_registry/lib/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

docker_registry/lib/cache.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import logging
-
 import redis
 
 from docker_registry.core import lru

requirements.txt

@@ -1,11 +1,9 @@
+blinker==1.3
 Flask==0.10.1
 Flask-cors==1.3.0
+gevent==1.0.1
+gunicorn==18.0
+PyYAML==3.11
 requests==2.3.0
 rsa==3.1.4
-PyYAML==3.11
-blinker==1.3
-gevent==1.0.1
 sqlalchemy==0.9.4
-bugsnag==2.0.1
-gunicorn==18.0
-docker-registry-core>=1,<2

setup.cfg

@@ -8,7 +8,3 @@ cover-erase=1
 cover-html=1
 cover-html-dir=reports
 ignore-files=(?:workflow|base)[.]py
-
-[flake8]
-ignore = H102,H304
-exclude = .tox,.git,*.egg,build

setup.py

@@ -14,13 +14,20 @@
 ver = sys.version_info
 
 if ver[0] == 2:
+    # Python 2 requires lzma backport
     requirements.insert(0, 'backports.lzma>=0.0.2')
     if ver[1] <= 6:
+        # Python 2.6 requires additional libraries
         requirements.insert(0, 'argparse>=1.2.1')
         requirements.insert(0, 'importlib>=1.0.3')
 
+# Require core (the reason this is out of req.txt is to ease tox)
+requirements.insert(0, 'docker-registry-core>=1,<2')
+
+# Explicit packages list to avoid setup_tools funkyness
 packages = ['docker_registry',
             'docker_registry.drivers',
+            'docker_registry.server',
             'docker_registry.lib',
             'docker_registry.storage',
             'docker_registry.lib.index']

tox.ini

@@ -1,17 +1,16 @@
-# py26 support: .format calls to cleanup in lib/index/db
-# py34 support: upgrade flask required
+# py34 support: flask is borked
 
 [tox]
 envlist     = flake8, py26, py27
 # py26,py32,py33,py34
 # skipsdist = True
 
 [flake8]
-ignore = H102,H304
-exclude = .tox,.git,*.egg,build
+ignore      = H102,H304
+exclude     = .tox,.git,*.egg,build
 
 [testenv]
-# XXX cryptography, clang, latest OSX, drugs and rock and roll:
+# XXX clang, latest OSX:
 #       http://bruteforce.gr/bypassing-clang-error-unknown-argument.html
 # XXX you might also need extra includes (for lzma-dev / xz) if you are on OSX
 # XXX and you might also need extra linkage (for gevent), same reason
@@ -31,9 +30,6 @@ deps        = ./depends/docker-registry-core/
 
 commands    = python setup.py nosetests
 
-#commands    = nosetests -w tests
-# commands    = nosetests -w tests --ignore-files=workflow.py --ignore-files=base.py --with-coverage --cover-package=docker_registry.lib,docker_registry.drivers,docker_registry.storage --cover-inclusive --cover-min-percentage=40 --cover-erase --cover-html --cover-html-dir=reports
-
 [testenv:flake8]
 # XXX Like all openstack packages, hacking can't be installed as an egg
 # so we need a special stance for flake8 env (that will break namespaces,
@@ -44,8 +40,3 @@ deps        = ./depends/docker-registry-core/
 commands    = flake8 {toxinidir}
 
 
-# To be ported
-#gunicorn==18.0
-#python-glanceclient==0.10.0
-#python-keystoneclient==0.3.1
-#gcs-oauth2-boto-plugin>=1.3