From 14d257ff8494eefc2afa35675d8bf179273a97a3 Mon Sep 17 00:00:00 2001
From: Phivos Stylianides <stphivos@gmail.com>
Date: Mon, 16 Oct 2017 23:58:56 +0300
Subject: [PATCH] Fix hardcoded requirement to six library

---
 MANIFEST.in                                   |  2 +-
 cli                                           | 38 -------------------
 .../{requirements-range.txt => core.txt}      |  1 +
 .../{requirements-testing.in => dev.txt}      |  3 --
 requirements/requirements-testing.txt         | 26 -------------
 requirements/requirements.in                  |  1 -
 requirements/requirements.txt                 | 11 ------
 setup.py                                      |  4 +-
 tox.ini                                       |  2 +-
 9 files changed, 5 insertions(+), 83 deletions(-)
 delete mode 100755 cli
 rename requirements/{requirements-range.txt => core.txt} (91%)
 rename requirements/{requirements-testing.in => dev.txt} (78%)
 delete mode 100644 requirements/requirements-testing.txt
 delete mode 100644 requirements/requirements.in
 delete mode 100644 requirements/requirements.txt

diff --git a/MANIFEST.in b/MANIFEST.in
index 420a9b8..ec565c2 100644
--- 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
deleted file mode 100755
index dbf9a3a..0000000
--- a/cli
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
-
-from argparse import ArgumentParser
-from subprocess import call
-
-
-def requirements(dev=None):
-    cmd = [
-        'pip-compile requirements/requirements.in',
-        'echo "-r requirements-range.txt # manually added by cli" >> requirements/requirements.txt'
-    ]
-
-    if dev:
-        cmd = ['pip-compile requirements/requirements-testing.in']
-
-    for c in cmd:
-        call(c, shell=True)
-
-
-def main():
-    parser = ArgumentParser()
-    parser.add_argument('function', help='name of function to run', choices=['req'])
-    parser.add_argument('-t', '--testing', help='generate requirements for testing', action='store_true', default=False)
-
-    options = parser.parse_args()
-    switcher = {
-        'req': lambda: requirements(options.testing)
-    }
-
-    func = switcher.get(options.function, None)
-    if func:
-        func()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/requirements/requirements-range.txt b/requirements/core.txt
similarity index 91%
rename from requirements/requirements-range.txt
rename to requirements/core.txt
index fd40838..0b4aa9c 100644
--- a/requirements/requirements-range.txt
+++ b/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 b/requirements/dev.txt
similarity index 78%
rename from requirements/requirements-testing.in
rename to requirements/dev.txt
index 88ea780..3ab8f53 100644
--- a/requirements/requirements-testing.in
+++ b/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
deleted file mode 100644
index 8893cff..0000000
--- a/requirements/requirements-testing.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile --output-file requirements/requirements-testing.txt requirements/requirements-testing.in
-#
-click==6.6                # via pip-tools
-configparser==3.5.0       # via flake8
-coverage==3.7.1
-djangorestframework==3.3.2
-enum34==1.1.6             # via flake8
-first==2.0.1              # via pip-tools
-flake8==3.0.4             # via pytest-flake8
-mccabe==0.5.2             # via flake8
-pip-tools==1.7.0
-pluggy==0.3.1             # via tox
-py==1.4.31                # via pytest, tox
-pycodestyle==2.0.0        # via flake8
-pyflakes==1.2.3           # via flake8
-pytest-cov==2.4.0
-pytest-django==3.1.2
-pytest-flake8==0.7
-pytest==3.0.3
-six==1.10.0               # via pip-tools
-tox==2.1.1
-virtualenv==13.1.2
diff --git a/requirements/requirements.in b/requirements/requirements.in
deleted file mode 100644
index b4c1474..0000000
--- a/requirements/requirements.in
+++ /dev/null
@@ -1 +0,0 @@
-mock==1.3.0
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
deleted file mode 100644
index 49ee5f1..0000000
--- a/requirements/requirements.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile --output-file requirements/requirements.txt requirements/requirements.in
-#
-funcsigs==1.0.2           # via mock
-mock==1.3.0
-pbr==2.0.0                # via mock
-six==1.10.0               # via mock
--r requirements-range.txt # manually added by cli
diff --git a/setup.py b/setup.py
index 43173e6..4123c5f 100644
--- 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='stphivos@gmail.com',
diff --git a/tox.ini b/tox.ini
index a71e294..753a0a7 100644
--- 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