From e93136f97b46c6b52ebc77bc3b7c4cebe72b1754 Mon Sep 17 00:00:00 2001
From: caseylitton <caseylitton@gmail.com>
Date: Thu, 1 Dec 2016 12:21:56 -0800
Subject: [PATCH] Remove package.json for setup.py

---
 MANIFEST.in      |  2 --
 package.json     | 38 --------------------------------------
 requirements.txt |  2 --
 setup.py         | 13 ++++---------
 tox.ini          |  1 +
 5 files changed, 5 insertions(+), 51 deletions(-)
 delete mode 100644 MANIFEST.in
 delete mode 100644 package.json

diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 06ff4741..00000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include package.json
-include requirements.txt
diff --git a/package.json b/package.json
deleted file mode 100644
index 8288e19a..00000000
--- a/package.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "name": "xblock-free-text-response",
-  "title": "FreeTextResponse XBlock",
-  "description": "Enables instructors to create questions with free-text responses.",
-  "version": "0.1.1",
-  "homepage": "https://github.com/Stanford-Online/xblock-free-text-response",
-  "author": {
-    "name": "Azim Pradhan",
-    "email": "azim.pradhan@gmail.com"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Stanford-Online/xblock-free-text-response.git"
-  },
-  "bugs": {
-    "url": "https://github.com/Stanford-Online/xblock-free-text-response/issues"
-  },
-  "scripts": {
-    "test": "grunt --verbose"
-  },
-  "devDependencies": {
-    "grunt": "^0.4.5",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-concat": "^0.5.0",
-    "grunt-contrib-uglify": "^0.6.0",
-    "grunt-contrib-less": "^0.11.4",
-    "grunt-contrib-csslint": "^0.3.1",
-    "grunt-contrib-cssmin": "^0.10.0",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-contrib-copy": "^0.6.0",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-htmlmin": "^0.3.0"
-  },
-  "keywords": [
-    "openedx",
-    "xblock"
-  ]
-}
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index fb19e016..e4709268 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,3 @@
-django<1.9,>=1.8
-enum34
 git+https://github.com/edx/XBlock.git#egg=XBlock
 git+https://github.com/edx/xblock-utils.git@v1.0.0#egg=xblock-utils==v1.0.0
 git+https://github.com/edx/opaque-keys.git@27dc382ea587483b1e3889a3d19cbd90b9023a06#egg=opaque-keys
diff --git a/setup.py b/setup.py
index c3c210b1..f47a9360 100644
--- a/setup.py
+++ b/setup.py
@@ -2,8 +2,6 @@
 import setuptools
 from setuptools.command.test import test as TestCommand
 
-package_json_file = open('package.json', 'r')
-package_json = json.load(package_json_file)
 
 class Tox(TestCommand):
     user_options = [('tox-args=', 'a', 'Arguments to pass to tox')]
@@ -28,13 +26,9 @@ def run_tests(self):
         sys.exit(errno)
 
 setuptools.setup(
-    name=package_json.get('name', 'xblock-test'),
-    version=package_json.get('version', '0.1.1'),
-    description=package_json.get('description'),
-    long_description=package_json.get('description'),
-    author=package_json.get('author', {}).get('name'),
-    author_email=package_json.get('author', {}).get('email'),
-    url=package_json.get('homepage'),
+    name="xblock-free-text-response",
+    version="0.1.1",
+    description="Enables instructors to create questions with free-text responses.",
     license='AGPL-3.0',
     packages=[
         'freetextresponse',
@@ -47,6 +41,7 @@ def run_tests(self):
         'mako',
         'XBlock',
         'xblock-utils',
+        'enum34',
     ],
     dependency_links=[
         'https://github.com/edx/xblock-utils/tarball/c39bf653e4f27fb3798662ef64cde99f57603f79#egg=xblock-utils',
diff --git a/tox.ini b/tox.ini
index d6e634d4..ff0774b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,7 @@ commands = {envpython} manage.py test
 [testenv:py27-dj18]
 deps =
     -rrequirements.txt
+    django<1.9,>=1.8
 
 [testenv:pep8]
 deps =