Set jsonschema requirement to <= 2.4.0

avian2 · May 13, 2016 · 5a848b3 · 5a848b3
1 parent 2d6e071
commit 5a848b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,13 +5,10 @@ python:
   - 2.7
   - 3.3
   - 3.4
-env:
-  - JSONSCHEMA="jsonschema"
 matrix:
   include:
     - python: "3.2"
-      env: JSONSCHEMA="jsonschema==2.3.0"
-install:
-  - pip install $JSONSCHEMA
+      install:
+        - pip install jsonschema==2.3.0
 script:
   - python setup.py test
diff --git a/README.rst b/README.rst
@@ -213,6 +213,10 @@ Requirements
 You need *jsonschema* (https://pypi.python.org/pypi/jsonschema) module
 installed.
 
+*jsonschema* 2.4.0 is recommended. With versions newer than 2.4.0,
+*get_schema()* method might not work correctly
+(https://github.com/avian2/jsonmerge/issues/20)
+
 
 Installation
 ------------

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
     author='Tomaz Solc',
     author_email='tomaz.solc@tablix.org',
     packages = [ 'jsonmerge' ],
-    install_requires = [ 'jsonschema' ],
+    install_requires = [ 'jsonschema<=2.4.0' ],
     test_suite = 'tests',
     classifiers = [
         "License :: OSI Approved :: MIT License",