Skip to content

Commit

Permalink
Merge pull request #21 from collective/conditionally-require-simplejson
Browse files Browse the repository at this point in the history
Conditionally require simplejson
  • Loading branch information
thet committed May 24, 2016
2 parents 654071b + 5fd6380 commit 9cdf34a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ Changelog
1.2 (unreleased)
----------------

- Do not require simplejson if we already have the native json module
[ale-rt]

- When doing an export with ``export_content`` and having constraints to skip
items, still allow to walk into subitems of the skipped ones - except for
skipped paths, where the whole path is skipped.
Expand Down
15 changes: 11 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ def find_packages(exclude=None):

version = '1.2.dev0'

requirements = [
'setuptools',
]

# since Python 2.6 simplejson is not needed anymore
try:
import json
except ImportError:
requirements.append('simplejson')

setup(
name='collective.jsonify',
version=version,
Expand All @@ -36,8 +46,5 @@ def find_packages(exclude=None):
namespace_packages=['collective'],
include_package_data=True,
zip_safe=False,
install_requires=[
'setuptools',
'simplejson',
],
install_requires=requirements,
)

0 comments on commit 9cdf34a

Please sign in to comment.