Skip to content

Commit

Permalink
Remove package.json for setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
caseylitton committed Dec 1, 2016
1 parent 3b4f0b5 commit e93136f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 51 deletions.
2 changes: 0 additions & 2 deletions MANIFEST.in

This file was deleted.

38 changes: 0 additions & 38 deletions package.json

This file was deleted.

2 changes: 0 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
django<1.9,>=1.8
enum34
git+https://github.com/edx/XBlock.git#egg=XBlock
git+https://github.com/edx/[email protected]#egg=xblock-utils==v1.0.0
git+https://github.com/edx/opaque-keys.git@27dc382ea587483b1e3889a3d19cbd90b9023a06#egg=opaque-keys
Expand Down
13 changes: 4 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')]
Expand All @@ -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',
Expand All @@ -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',
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ commands = {envpython} manage.py test
[testenv:py27-dj18]
deps =
-rrequirements.txt
django<1.9,>=1.8

[testenv:pep8]
deps =
Expand Down

0 comments on commit e93136f

Please sign in to comment.