Skip to content
Browse files

remove simplejson ; just use built-in JSON (do as Django does)

  • Loading branch information...
1 parent ea11e5f commit 458fe81e5da7ff9d47eb0de0910df843ba534810 @computron computron committed Mar 3, 2013
View
1 docs/installation.rst
@@ -27,7 +27,6 @@ Download FireWorks and dependencies
pip install nose
pip install pyyaml
- pip install simplejson
pip install pymongo
.. tip:: If you have an old version of these libraries installed, you might need to run ``pip install --upgrade <PACKAGE>``. In particular, ensure that pymongo is >= 2.4.2 and includes MongoClient.
View
2 fireworks/core/fworker.py
@@ -4,7 +4,7 @@
This module contains classes relevant for a FireWorker (worker computing resource)
"""
-import simplejson as json
+import json
from fireworks.core.fw_constants import DATETIME_HANDLER
from fireworks.utilities.fw_serializers import FWSerializable
View
2 fireworks/core/rocket.py
@@ -6,7 +6,7 @@
import os
import socket
import traceback
-import simplejson as json
+import json
from fireworks.core.firetask import FWAction
from fireworks.core.fw_constants import DATETIME_HANDLER, PRINT_FW_JSON
View
1 fireworks/tests/master_tests.py
@@ -22,7 +22,6 @@ class TestImports(unittest.TestCase):
def test_imports(self):
import yaml
- import simplejson
import pymongo
# test that MongoClient is available (newer pymongo)
from pymongo import MongoClient
View
2 fireworks/utilities/fw_serializers.py
@@ -32,7 +32,7 @@
FW_NAME_UPDATES, USE_PYMATGEN_SERIALIZATION, DATETIME_HANDLER
import pkgutil
import inspect
-import simplejson as json # note that ujson is faster, but at this time does not support "default" in dumps()
+import json # note that ujson is faster, but at this time does not support "default" in dumps()
import importlib
import datetime
View
1 requirements.txt
@@ -1,3 +1,2 @@
PyYAML>=3.1.0
-simplejson>=3.0
pymongo>=2.4.2
View
2 scripts/lp_run.py
@@ -9,7 +9,7 @@
from fireworks.core.launchpad import LaunchPad
from fireworks.core.firework import FireWork
import ast
-import simplejson as json
+import json
from fireworks.core.workflow import Workflow
__author__ = 'Anubhav Jain'
View
25 setup.py
@@ -24,18 +24,13 @@
license='MIT',
packages=find_packages(),
zip_safe=False,
- install_requires=['pyyaml>=3.1.0', 'simplejson>=3.0', 'pymongo>=2.4.2'],
- classifiers=[
- "Programming Language :: Python :: 2.7",
- "Development Status :: 2 - Pre-Alpha",
- "Intended Audience :: Science/Research",
- "Intended Audience :: System Administrators",
- "Intended Audience :: Information Technology",
- "License :: OSI Approved :: MIT License",
- "Operating System :: OS Independent",
- "Topic :: Other/Nonlisted Topic",
- "Topic :: Scientific/Engineering"],
- test_suite='nose.collector',
- tests_require=['nose'],
- scripts=[os.path.join(os.path.join(module_dir, "scripts", f)) for f in os.listdir(os.path.join(module_dir, "scripts"))]
- )
+ install_requires=['pyyaml>=3.1.0', 'pymongo>=2.4.2'],
+ classifiers=["Programming Language :: Python :: 2.7", "Development Status :: 2 - Pre-Alpha",
+ "Intended Audience :: Science/Research", "Intended Audience :: System Administrators",
+ "Intended Audience :: Information Technology", "License :: OSI Approved :: MIT License",
+ "Operating System :: OS Independent", "Topic :: Other/Nonlisted Topic",
+ "Topic :: Scientific/Engineering"],
+ test_suite='nose.collector',
+ tests_require=['nose'],
+ scripts=[os.path.join(os.path.join(module_dir, "scripts", f)) for f in
+ os.listdir(os.path.join(module_dir, "scripts"))])

0 comments on commit 458fe81

Please sign in to comment.
Something went wrong with that request. Please try again.