rearranging code into a proper python package, per #1

.travis.yml

@@ -1,7 +1,9 @@
 language: python
 python:
   - "2.7"
-install: pip install tox
+install:
+  - pip install tox
+  - pip install .
 script: tox
 before_install:
   - sudo apt-get update

Dockerfile

@@ -15,12 +15,11 @@ RUN cd /tmp; wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.p
 RUN cd /tmp; python ez_setup.py; easy_install pip; \
     rm ez_setup.py
 
-ADD requirements.txt /docker-registry/
-RUN cd /docker-registry && pip install -r requirements.txt
-
 ADD . /docker-registry
 ADD ./config/boto.cfg /etc/boto.cfg
 
+RUN pip install /docker-registry/
+
 RUN cp --no-clobber /docker-registry/config/config_sample.yml /docker-registry/config/config.yml
 
 EXPOSE 5000

README.md

@@ -276,7 +276,7 @@ sudo apt-get install build-essential python-dev libevent-dev python-pip libssl-d
 Then install the Registry app:
 
 ```
-sudo pip install -r requirements.txt
+sudo pip install .
 ```
 
 #### On Red Hat-based systems:
@@ -292,7 +292,7 @@ should not require the additional repositories.
 Then install the Registry app:
 
 ```
-sudo python-pip install -r requirements.txt
+sudo python-pip install .
 ```
 
 #### Run it

build.sh

@@ -7,7 +7,7 @@ cd $SERVICE_APPROOT
 . ~/env/bin/activate
 
 [ -f requirements.txt ] &&
-    pip install --download-cache=~/.pip-cache -r requirements.txt || exit 1
+    pip install --download-cache=~/.pip-cache . || exit 1
 
 cp -R * ~/
 

registry/__init__.py → docker_registry/__init__.py

@@ -6,7 +6,7 @@
 from .images import *
 from .status import *
 
-import config
+from docker_registry.lib import config
 
 cfg = config.load()
 if cfg.standalone is not False:

registry/app.py → docker_registry/app.py

@@ -9,11 +9,11 @@
     bugsnag = None
 import flask
 
-import config
-import toolkit
+from docker_registry.lib import config
+from docker_registry import toolkit
 
 
-VERSION = '0.6.6'
+VERSION = '0.6.7'
 app = flask.Flask('docker-registry')
 cfg = config.load()
 loglevel = getattr(logging, cfg.get('loglevel', 'INFO').upper())

registry/images.py → docker_registry/images.py

@@ -7,16 +7,16 @@
 import flask
 import simplejson as json
 
-import checksums
-import mirroring
-import storage
-import toolkit
+from docker_registry.lib import checksums
+from docker_registry.lib import layers
+from docker_registry.lib import mirroring
+from docker_registry import storage
+from docker_registry.storage import local
+from docker_registry import toolkit
 
 from .app import app
 from .app import cfg
-import layers
 
-import storage.local
 store = storage.load()
 logger = logging.getLogger(__name__)
 
@@ -60,7 +60,7 @@ def _get_image_layer(image_id, headers=None, bytes_range=None):
     accel_uri_prefix = cfg.nginx_x_accel_redirect
     path = store.image_layer_path(image_id)
     if accel_uri_prefix:
-        if isinstance(store, storage.local.LocalStorage):
+        if isinstance(store, local.LocalStorage):
             accel_uri = '/'.join([accel_uri_prefix, path])
             headers['X-Accel-Redirect'] = accel_uri
             logger.debug('send accelerated {0} ({1})'.format(

registry/index.py → docker_registry/index.py

@@ -3,11 +3,11 @@
 import flask
 import simplejson as json
 
-import config
-import mirroring
-import signals
-import storage
-import toolkit
+from docker_registry.lib import config
+from docker_registry.lib import mirroring
+from docker_registry.lib import signals
+from docker_registry import storage
+from docker_registry import toolkit
 
 from .app import app
 

lib/cache.py → docker_registry/lib/cache.py

@@ -2,7 +2,7 @@
 
 import redis
 
-import config
+from . import config
 
 
 # Default options

lib/cache_lru.py → docker_registry/lib/cache_lru.py

@@ -3,7 +3,7 @@
 
 import redis
 
-import config
+from . import config
 
 
 # Default options

lib/config.py → docker_registry/lib/config.py

@@ -54,7 +54,7 @@ def load():
     data = None
     config_path = os.environ.get('DOCKER_REGISTRY_CONFIG', 'config.yml')
     if not os.path.isabs(config_path):
-        config_path = os.path.join(os.path.dirname(__file__), '..',
+        config_path = os.path.join(os.path.dirname(__file__), '../../',
                                    'config', config_path)
     with open(config_path) as f:
         data = yaml.load(f)

lib/layers.py → docker_registry/lib/layers.py

@@ -4,9 +4,10 @@
 import backports.lzma as lzma
 import simplejson as json
 
-import cache
-import rqueue
-import storage.local
+from . import cache
+from . import rqueue
+from docker_registry import storage
+
 store = storage.load()
 
 FILE_TYPES = {

lib/mirroring.py → docker_registry/lib/mirroring.py

@@ -3,10 +3,10 @@
 import logging
 import requests
 
-import cache
-import config
-import registry.toolkit as toolkit
-import storage
+from . import cache
+from . import config
+from docker_registry import storage
+from docker_registry import toolkit
 
 
 DEFAULT_CACHE_TAGS_TTL = 48 * 3600

registry/status.py → docker_registry/status.py

@@ -1,15 +1,15 @@
 __all__ = ['registry_status']
 
+import socket
+import sys
+
 import gevent.monkey
 gevent.monkey.patch_all()
 
-import cache
-import config
-import gevent
-import socket
-import storage
-import sys
-import toolkit
+from docker_registry.lib import cache
+from docker_registry.lib import config
+from docker_registry import storage
+from docker_registry import toolkit
 
 from .app import app
 

lib/storage/__init__.py → docker_registry/storage/__init__.py

@@ -1,7 +1,7 @@
 
 import tempfile
 
-import config
+from docker_registry.lib import config
 
 
 __all__ = ['load']

lib/storage/boto_base.py → docker_registry/storage/boto_base.py

@@ -8,7 +8,7 @@
 import os
 import tempfile
 
-import cache_lru
+from docker_registry.lib import cache_lru
 
 from . import Storage
 

lib/storage/ellipticsbackend.py → docker_registry/storage/ellipticsbackend.py

@@ -11,7 +11,7 @@
 import itertools
 import logging
 
-import cache_lru
+from docker_registry.lib import cache_lru
 
 from . import Storage
 

lib/storage/gcs.py → docker_registry/storage/gcs.py

@@ -7,7 +7,7 @@
 import boto.gs.connection
 import boto.gs.key
 
-import cache_lru
+from docker_registry.lib import cache_lru
 
 from boto_base import BotoStorage
 

lib/storage/glance.py → docker_registry/storage/glance.py

@@ -5,7 +5,7 @@
 import glanceclient
 from keystoneclient.v2_0 import client as keystoneclient
 
-import signals
+from docker_registry.lib import signals
 
 from . import Storage
 from .local import LocalStorage

lib/storage/local.py → docker_registry/storage/local.py

@@ -2,7 +2,7 @@
 import os
 import shutil
 
-import cache_lru
+from docker_registry.lib import cache_lru
 
 from . import Storage
 

lib/storage/s3.py → docker_registry/storage/s3.py

@@ -8,7 +8,7 @@
 import boto.s3.connection
 import boto.s3.key
 
-import cache_lru
+from docker_registry.lib import cache_lru
 
 from boto_base import BotoStorage
 

lib/storage/swift.py → docker_registry/storage/swift.py

@@ -1,5 +1,5 @@
 
-import cache_lru
+from docker_registry.lib import cache_lru
 import swiftclient
 
 from . import Storage

registry/tags.py → docker_registry/tags.py

@@ -7,10 +7,10 @@
 import flask
 import simplejson as json
 
-import mirroring
-import signals
-import storage
-import toolkit
+from docker_registry.lib import mirroring
+from docker_registry.lib import signals
+from docker_registry import storage
+from docker_registry import toolkit
 
 from .app import app
 

registry/toolkit.py → docker_registry/toolkit.py

@@ -11,8 +11,8 @@
 import rsa
 import simplejson as json
 
-import config
-import storage
+from docker_registry.lib import config
+from docker_registry import storage
 
 
 logger = logging.getLogger(__name__)

scripts/create_ancestry.py

@@ -1,15 +1,11 @@
 #!/usr/bin/env python
 
 import hashlib
-import os
 import sys
 
 import simplejson as json
 
-root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-sys.path.append(os.path.join(root_path, 'lib'))
-
-import storage
+from docker_registry import storage
 
 
 store = storage.load()

scripts/diff-worker.py

@@ -3,18 +3,13 @@
 import argparse
 import logging
 import os
-import sys
 
 import redis
 
-root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-sys.path.append(root_path)
-sys.path.append(os.path.join(root_path, 'lib'))
-
-import layers
-import rlock
-import rqueue
-import storage
+from docker_registry.lib import layers
+from docker_registry.lib import rlock
+from docker_registry.lib import rqueue
+from docker_registry import storage
 
 store = storage.load()
 

scripts/dump_repos_data.py

@@ -1,14 +1,10 @@
 #!/usr/bin/env python
 
-import os
 import sys
 
 import simplejson as json
 
-root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-sys.path.append(os.path.join(root_path, 'lib'))
-
-import storage
+from docker_registry import storage
 
 store = storage.load()
 

scripts/import_old_tags.py

@@ -1,12 +1,8 @@
 #!/usr/bin/env python
 
-import os
 import sys
 
-root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-sys.path.append(os.path.join(root_path, 'lib'))
-
-import storage
+from docker_registry import storage
 
 
 # Copy/Pasted from old models