From 53b3f7d6674caa88ad4ecdf59990c35f287f0a43 Mon Sep 17 00:00:00 2001 From: Alexander Alber Date: Thu, 21 Jul 2016 14:55:53 -0400 Subject: [PATCH] Refactor mainline to dipppy --- README.rst | 11 +++++++++-- dipppy/__init__.py | 9 +++++++++ {mainline => dipppy}/_version.py | 0 {mainline => dipppy}/catalog.py | 4 ++-- {mainline => dipppy}/di.py | 10 +++++----- {mainline => dipppy}/exceptions.py | 0 {mainline => dipppy}/injection.py | 4 ++-- {mainline => dipppy}/provider.py | 4 ++-- {mainline => dipppy}/scope.py | 2 +- {mainline => dipppy}/utils.py | 0 mainline/__init__.py | 9 --------- setup.py | 8 ++++---- 12 files changed, 34 insertions(+), 27 deletions(-) create mode 100644 dipppy/__init__.py rename {mainline => dipppy}/_version.py (100%) rename {mainline => dipppy}/catalog.py (96%) rename {mainline => dipppy}/di.py (96%) rename {mainline => dipppy}/exceptions.py (100%) rename {mainline => dipppy}/injection.py (97%) rename {mainline => dipppy}/provider.py (95%) rename {mainline => dipppy}/scope.py (98%) rename {mainline => dipppy}/utils.py (100%) delete mode 100644 mainline/__init__.py diff --git a/README.rst b/README.rst index 9773885..a3bf3e4 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,8 @@ -mainline +Dipp.py ======== +Power, precision, pronouns + Simple yet powerful python dependency injection. Tested with Python 2.7, 3.4, 3.5. @@ -11,13 +13,18 @@ Tested with Python 2.7, 3.4, 3.5. - API Docs: http://mainline.readthedocs.org/en/latest/mainline.html - PyPi: https://pypi.python.org/pypi/mainline +Note +---- +This project was previously called mainline. While we transition to the new name, some links (including the ones above) may still reference the old Mainline name. Installation ------------ +Old versions may still be installed using the 'mainline' name. + .. code:: sh - pip install mainline + pip install dipp.py diff --git a/dipppy/__init__.py b/dipppy/__init__.py new file mode 100644 index 0000000..ae0cdbb --- /dev/null +++ b/dipppy/__init__.py @@ -0,0 +1,9 @@ +from dipppy._version import __version__ + +from dipppy.exceptions import DiError, UnresolvableError, UnprovidableError + +from dipppy.di import Di +from dipppy.catalog import Catalog +from dipppy.provider import Provider, provider_factory +from dipppy.scope import NoneScope, GlobalScope, ProcessScope, ThreadScope, \ + ProxyScope, NamespacedProxyScope diff --git a/mainline/_version.py b/dipppy/_version.py similarity index 100% rename from mainline/_version.py rename to dipppy/_version.py diff --git a/mainline/catalog.py b/dipppy/catalog.py similarity index 96% rename from mainline/catalog.py rename to dipppy/catalog.py index efb7a90..63b0adc 100644 --- a/mainline/catalog.py +++ b/dipppy/catalog.py @@ -2,8 +2,8 @@ import six import abc -from mainline.utils import ProxyMutableMapping -from mainline.provider import IProvider +from dipppy.utils import ProxyMutableMapping +from dipppy.provider import IProvider _sentinel = object() _provider_mapping_factory = dict diff --git a/mainline/di.py b/dipppy/di.py similarity index 96% rename from mainline/di.py rename to dipppy/di.py index 8c56b0f..16879cd 100644 --- a/mainline/di.py +++ b/dipppy/di.py @@ -1,10 +1,10 @@ import functools -from mainline.catalog import ICatalog, Catalog -from mainline.exceptions import UnresolvableError -from mainline.injection import ClassPropertyInjector, AutoSpecInjector, SpecInjector -from mainline.scope import ScopeRegistry, NoneScope, GlobalScope -from mainline.provider import Provider, provider_factory +from dipppy.catalog import ICatalog, Catalog +from dipppy.exceptions import UnresolvableError +from dipppy.injection import ClassPropertyInjector, AutoSpecInjector, SpecInjector +from dipppy.scope import ScopeRegistry, NoneScope, GlobalScope +from dipppy.provider import Provider, provider_factory _sentinel = object() diff --git a/mainline/exceptions.py b/dipppy/exceptions.py similarity index 100% rename from mainline/exceptions.py rename to dipppy/exceptions.py diff --git a/mainline/injection.py b/dipppy/injection.py similarity index 97% rename from mainline/injection.py rename to dipppy/injection.py index 1940f35..1b00083 100644 --- a/mainline/injection.py +++ b/dipppy/injection.py @@ -4,8 +4,8 @@ import six import wrapt -from mainline.exceptions import DiError -from mainline.utils import OBJECT_INIT, classproperty +from dipppy.exceptions import DiError +from dipppy.utils import OBJECT_INIT, classproperty class Injector(object): diff --git a/mainline/provider.py b/dipppy/provider.py similarity index 95% rename from mainline/provider.py rename to dipppy/provider.py index 432e7e4..e7956e1 100644 --- a/mainline/provider.py +++ b/dipppy/provider.py @@ -1,7 +1,7 @@ import functools -from mainline.exceptions import UnprovidableError -from mainline.scope import ScopeRegistry, NoneScope +from dipppy.exceptions import UnprovidableError +from dipppy.scope import ScopeRegistry, NoneScope _sentinel = object() diff --git a/mainline/scope.py b/dipppy/scope.py similarity index 98% rename from mainline/scope.py rename to dipppy/scope.py index f2bcff5..14964fd 100644 --- a/mainline/scope.py +++ b/dipppy/scope.py @@ -2,7 +2,7 @@ import threading import collections -from mainline.utils import ProxyMutableMapping +from dipppy.utils import ProxyMutableMapping class IScope(ProxyMutableMapping): diff --git a/mainline/utils.py b/dipppy/utils.py similarity index 100% rename from mainline/utils.py rename to dipppy/utils.py diff --git a/mainline/__init__.py b/mainline/__init__.py deleted file mode 100644 index 2688d2a..0000000 --- a/mainline/__init__.py +++ /dev/null @@ -1,9 +0,0 @@ -from mainline._version import __version__ - -from mainline.exceptions import DiError, UnresolvableError, UnprovidableError - -from mainline.di import Di -from mainline.catalog import Catalog -from mainline.provider import Provider, provider_factory -from mainline.scope import NoneScope, GlobalScope, ProcessScope, ThreadScope, \ - ProxyScope, NamespacedProxyScope diff --git a/setup.py b/setup.py index b84fb7c..a44a78a 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ import sys __version__ = 'unknown' # This is ovewritten by the execfile below -exec (open('mainline/_version.py').read()) +exec (open('dipppy/_version.py').read()) def parse_requirements(filename): ret = [line.strip() for line in open(filename).read().splitlines()] @@ -10,9 +10,9 @@ def parse_requirements(filename): return ret conf = dict( - name='mainline', + name='dipp.py', description='Simple yet powerful python dependency injection for py2/py3k', - url='http://github.com/vertical-knowledge/mainline', + url='http://github.com/vertical-knowledge/dipppy', author='Vertical Knowledge', author_email='ops@vertical-knowledge.com', license='GPL', @@ -20,7 +20,7 @@ def parse_requirements(filename): classifiers=[], version=__version__, - packages=['mainline'], + packages=['dipp.py'], install_requires=parse_requirements('requirements/install.txt'), tests_require=parse_requirements('requirements/test.txt'),