Merge branch 'develop':v1.0 release

xlwings · Oct 19, 2016 · ca43da7 · ca43da7
2 parents 958effe + fa3690e
commit ca43da7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: python
 
 python:
-  - 2.6
   - 2.7
   - 3.2
   - 3.3

diff --git a/jsondiff/__init__.py b/jsondiff/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.2.0'
+__version__ = '1.0.0'
 
 import sys
 import json

diff --git a/setup.py b/setup.py
@@ -16,6 +16,7 @@
     keywords=['json', 'diff', 'diffing', 'difference', 'patch', 'delta', 'dict', 'LCS'],
     classifiers=[
         'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
     ],
 )
-Original file line number
+Diff line change
@@ -1,7 +1,6 @@
     language: python
     python:
-      - 2.6
       - 2.7
       - 3.2
       - 3.3
@@ Expand Down @@