[airavata-django-portal] 06/09: AIRAVATA-2868 setup.py for abstract dependencies, req.txt for concrete deps

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit 74092591d9ce8d4b5538e6fc32626484ab4e17dc
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Oct 4 15:46:30 2018 -0400

    AIRAVATA-2868 setup.py for abstract dependencies, req.txt for concrete deps
---
 requirements-dev.txt | 5 +++++
 requirements.txt     | 7 +++++--
 setup.py             | 6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 0000000..e1e5f8e
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,5 @@
+-r requirements.txt
+flake8==3.5.0
+flake8-isort==2.5
+
+-e ".[dev]"
diff --git a/requirements.txt b/requirements.txt
index bb61566..2c3c63c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,11 @@
-Django==1.11.3
+# Pin these dependencies
+Django==1.11.16
 requests==2.13.0
 requests-oauthlib==0.7.0
 thrift==0.10.0
 djangorestframework==3.8.2
 
 wagtail==2.0
-wagtailfontawesome>=1.1.3,<1.2
+wagtailfontawesome==1.1.3
+
+-e "."
diff --git a/setup.py b/setup.py
index 6a8ec73..6fc0d7e 100644
--- a/setup.py
+++ b/setup.py
@@ -20,13 +20,13 @@ setup(
     license='Apache License 2.0',
     packages=find_packages(),
     install_requires=[
-            'Django>=1.11,<2.0',
+            'Django',
+            'djangorestframework',
             'requests',
             'requests-oauthlib',
             'thrift',
-            'djangorestframework',
             'wagtail',
-            'wagtailfontawesome>=1.1.3,<1.2'
+            'wagtailfontawesome'
     ],
     extras_require={
         'dev': [