Squashed 'json/' changes from ddef9b0..abdd47f

abdd47f Add a test for large int comparisons. git-subtree-dir: json git-subtree-split: abdd47f9dff99a116c8ce09505f2e8f61433dbe8
python-jsonschema · Jun 2, 2014 · ed332a1 · ed332a1
1 parent 161f307
commit ed332a1
Show file tree

Hide file tree

Showing 100 changed files with 25 additions and 5,676 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,26 +1 @@
-.DS_Store
-.idea
-
-*.pyc
-*.pyo
-
-*.egg-info
-_build
-build
-dist
-MANIFEST
-
-.coverage
-.coveragerc
-coverage
-htmlcov
-
-_cache
-_static
-_templates
-
-_trial_temp
-
-.tox
-
 TODO
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,4 @@
 language: python
-python:
-  - "pypy"
-  - "2.6"
-  - "2.7"
-  - "3.3"
-install:
-    - python setup.py -q install
-script:
-    - if [[ "$(python -c 'import sys; print sys.version_info[:2]')" == "(2, 6)" ]]; then pip install unittest2; fi
-    - py.test --tb=native jsonschema
-    - python -m doctest README.rst
+python: "2.7"
+install: pip install jsonschema
+script: bin/jsonschema_suite check
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
diff --git a/COPYING b/COPYING
diff --git a/json/LICENSE → LICENSE b/json/LICENSE → LICENSE
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/json/README.md → README.md b/json/README.md → README.md
diff --git a/README.rst b/README.rst
diff --git a/json/bin/jsonschema_suite → bin/jsonschema_suite b/json/bin/jsonschema_suite → bin/jsonschema_suite