Merge pull request #142 from ets-labs/138_cython_injections

Add injections extension

Author: rmk135

.coveragerc

@@ -1,6 +1,7 @@
 [run]
-include = dependency_injector/*
-omit = tests/*
+source = src/dependency_injector
+omit = tests/unit
+plugins = Cython.Coverage
 
 [html]
 directory=reports/unittests/

.gitignore

@@ -63,7 +63,7 @@ venv/
 .ropeproject/
 
 # C extensions
-dependency_injector/*.c
-dependency_injector/*.so
-dependency_injector/providers/*.c
-dependency_injector/providers/*.so
+src/dependency_injector/*.c
+src/dependency_injector/*.so
+src/dependency_injector/providers/*.c
+src/dependency_injector/providers/*.so

.pylintrc

@@ -2,7 +2,7 @@
 
 # Add <file or directory> to the black list. It should be a base name, not a
 # path. You may set this option multiple times.
-ignore=utils,test
+ignore=utils,tests
 
 [MESSAGES CONTROL]
 

.travis.yml

@@ -1,18 +1,22 @@
 sudo: false
+install: 
+ - pip install tox
+ - pip install cython
+ - make cythonize
+script: 
+ - tox
 language: python
-install: pip install tox
-script: tox
 python:
- - 3.5
+  - 3.5
 env:
- - TOXENV=coveralls
- - TOXENV=pylint
- - TOXENV=flake8
- - TOXENV=pydocstyle
- - TOXENV=py26
- - TOXENV=py27
- - TOXENV=py33
- - TOXENV=py34
- - TOXENV=py35
- - TOXENV=pypy
- - TOXENV=pypy3
+  - TOXENV=coveralls DEPENDENCY_INJECTOR_DEBUG_MODE=1
+  - TOXENV=pylint
+  - TOXENV=flake8
+  - TOXENV=pydocstyle
+  - TOXENV=py26
+  - TOXENV=py27
+  - TOXENV=py33
+  - TOXENV=py34
+  - TOXENV=py35
+  - TOXENV=pypy
+  - TOXENV=pypy3

MANIFEST.in

@@ -1,4 +1,4 @@
-include dependency_injector/*
+recursive-include src/dependency_injector *.py *.pyx *.pxd *.c
 include README.rst
 include CONTRIBUTORS.rst
 include LICENSE.rst

Makefile

@@ -1,33 +1,62 @@
-VERSION:=$(shell python setup.py --version)
+VERSION := $(shell python setup.py --version)
+
+CYTHON_SRC := $(shell find src/dependency_injector -name '*.pyx')
+
+CYTHON_DIRECTIVES =
+
+ifdef DEPENDENCY_INJECTOR_DEBUG_MODE
+CYTHON_DIRECTIVES += -Xprofile=True
+CYTHON_DIRECTIVES += -Xlinetrace=True
+endif
+
 
 clean:
 # Clean sources
-find dependency_injector -name '*.py[co]' -delete
-find dependency_injector -name '__pycache__' -delete
-find dependency_injector -name '*.c' -delete
-find dependency_injector -name '*.so' -delete
+find src -name '*.py[cod]' -delete
+find src -name '__pycache__' -delete
+find src -name '*.c' -delete
+find src -name '*.so' -delete
+find src -name '*.html' -delete
 # Clean tests
 find tests -name '*.py[co]' -delete
 find tests -name '__pycache__' -delete
 # Clean examples
 find examples -name '*.py[co]' -delete
 find examples -name '__pycache__' -delete
 
-tests: clean
+cythonize:
+# Compile Cython to C
+cython -a $(CYTHON_DIRECTIVES) $(CYTHON_SRC)
+# Move all Cython html reports
+mkdir -p reports/cython/
+find src -name '*.html' -exec mv {} reports/cython/ \;
+
+build: clean cythonize
+# Compile C extensions
+python setup.py build_ext --inplace
+
+install: uninstall clean cythonize
+pip install -ve .
+
+uninstall:
+- pip uninstall -y -q dependency-injector 2> /dev/null
+
+test: build
 # Unit tests with coverage report
 coverage erase
-coverage run --rcfile=./.coveragerc -m unittest2 discover tests
+coverage run --rcfile=./.coveragerc -m unittest2 discover tests/unit
 coverage report --rcfile=./.coveragerc
 coverage html --rcfile=./.coveragerc
-coverage erase
+
+check:
 # Static analysis
-flake8 --max-complexity=10 dependency_injector/
+flake8 --max-complexity=10 src/dependency_injector/
 flake8 --max-complexity=10 examples/
 # Code style analysis
-pydocstyle dependency_injector/
+pydocstyle src/dependency_injector/
 pydocstyle examples/
 
-publish: clean
+publish: cythonize
 # Create and upload build
 python setup.py sdist upload
 # Create and upload tag

docs/conf.py

@@ -56,7 +56,7 @@
 #
 # The short X.Y version.
 # Getting version:
-with open('../dependency_injector/__init__.py') as init_file:
+with open('../src/dependency_injector/__init__.py') as init_file:
  version = re.search('VERSION = \'(.*?)\'', init_file.read()).group(1)
 
 # The full version, including alpha/beta/rc tags.
@@ -281,7 +281,7 @@
 # dir menu entry, description, category)
 texinfo_documents = [
  (master_doc, 'Dependency Injector', u'Dependency Injector Documentation',
- author, 'Dependency Injector', 'Python dependency injection framework',
+ author, 'Dependency Injector', 'Dependency injection microframework for Python',
  'Miscellaneous'),
 ]
 

docs/main/changelog.rst

@@ -9,8 +9,14 @@ follows `Semantic versioning`_
 
 Development version
 -------------------
+- Add ``dependency_injector.injections`` module (C extension).
 - Remove ``@inject`` decorator.
-- Add makefile (``clean``, ``tests`` & ``publish`` commands).
+- Add makefile (``clean``, ``test``, ``build``, ``install``, ``uninstall`` 
+ & ``publish`` commands).
+- Update repository structure:
+
+ - Sources are moved under ``src``.
+ - Tests are moved under ``tests/unit``.
 
 .. - No features.