Clean up and final fixes

.coveragerc

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

Makefile

@@ -35,13 +35,13 @@ build: clean cythonize
 # Compile C extensions
 python setup.py build_ext --inplace
 
-install: clean cythonize
-python setup.py install
+install: uninstall clean cythonize
+pip install . -v
 
 uninstall:
 - pip uninstall -y -q dependency-injector 2> /dev/null
 
-test:
+test: build
 # Unit tests with coverage report
 coverage erase
 coverage run --rcfile=./.coveragerc -m unittest2 discover tests/unit
@@ -50,10 +50,10 @@ test:
 
 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: cythonize

setup.py

@@ -41,8 +41,7 @@
  'dependency_injector.providers',
  ],
  package_dir={
- 'dependency_injector': 'src/dependency_injector',
- 'dependency_injector.providers': 'src/dependency_injector/providers',
+ '': 'src',
  },
  ext_modules=[
  Extension('dependency_injector.injections',

tox.ini

@@ -25,18 +25,18 @@ commands=
 deps=
  pylint
 commands=
- - pylint -f colorized --rcfile=./.pylintrc dependency_injector
+ - pylint -f colorized --rcfile=./.pylintrc src/dependency_injector
 
 [testenv:flake8]
 deps=
  flake8
 commands=
- flake8 --max-complexity=10 dependency_injector/
+ flake8 --max-complexity=10 src/dependency_injector/
  flake8 --max-complexity=10 examples/
 
 [testenv:pydocstyle]
 deps=
  pydocstyle
 commands=
- pydocstyle dependency_injector/
+ pydocstyle src/dependency_injector/
  pydocstyle examples/