Merge pull request stphivos#53 from stphivos/fix/req_six_hardcoded

Fix hardcoded requirement to six library
carta · Oct 16, 2017 · e2e1151 · e2e1151
2 parents 2573193 + 14d257f
commit e2e1151
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 83 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,2 @@
-include setup.cfg README.md requirements/requirements-range.txt requirements/requirements.txt
+include setup.cfg README.md requirements/core.txt
 recursive-include django_mock_queries *.py
diff --git a/cli b/cli
diff --git a/requirements/requirements-range.txt → requirements/core.txt b/requirements/requirements-range.txt → requirements/core.txt
@@ -1,2 +1,3 @@
+mock
 model_mommy>=1.2.6,<=1.3.99
 Django>=1.8.17,<1.11.99
diff --git a/requirements/requirements-testing.in → requirements/dev.txt b/requirements/requirements-testing.in → requirements/dev.txt
@@ -1,6 +1,3 @@
-# -r requirements.txt
-
-pip-tools==1.7.0
 pytest==3.0.3
 pytest-cov==2.4.0
 pytest-flake8==0.7

diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt
diff --git a/requirements/requirements.in b/requirements/requirements.in
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
diff --git a/setup.py b/setup.py
@@ -1,13 +1,13 @@
 from distutils.core import setup
 from pip.req import parse_requirements
 
-install_req = parse_requirements('requirements/requirements.txt', session='skip')
+install_req = parse_requirements('requirements/core.txt', session='skip')
 req = [str(ir.req) for ir in install_req]
 
 setup(
  name='django_mock_queries',
  packages=['django_mock_queries'],
- version='1.0.0',
+ version='1.0.2',
  description='A django library for mocking queryset functions in memory for testing',
  author='Phivos Stylianides',
  author_email='[email protected]',

diff --git a/tox.ini b/tox.ini
@@ -11,7 +11,7 @@ flake8-max-line-length = 120
 
 [testenv]
 deps =
- -rrequirements/requirements-testing.txt
+ -rrequirements/dev.txt
  dj18: Django==1.8.17
  dj19: Django==1.9.12
  dj110: Django==1.10.5