Python 3.7 support + upgrade cchardet (#227)

* Python 3.7 + upgrade cchardet * fix travis for Python 3.7
frictionlessdata · Oct 16, 2018 · fa8aeb7 · fa8aeb7
1 parent 0d80013
commit fa8aeb7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,12 +4,16 @@ sudo:
 language:
   python
 
-python:
-  - 2.7
-#  - 3.4  # FIXME: There's a bug on setuptools on 3.4 that breaks our tests
-#  (see https://github.com/pypa/setuptools/issues/951)
-  - 3.5
-  - 3.6
+matrix:
+  include:
+    - python: 2.7
+    # - python: 3.4  # FIXME: There's a bug on setuptools on 3.4 that breaks our tests
+    #  (see https://github.com/pypa/setuptools/issues/951)
+    - python: 3.5
+    - python: 3.6
+    - python: 3.7
+      dist: xenial
+      sudo: required
 
 env:
   global:

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@ def read(*paths):
     'six>=1.10,<2.0',
     'click>=6.7,<8.0',
     'requests>=2.8,<3.0',
-    'cchardet>=1.0,<2.0',
+    'cchardet>=1.0,<3.0',
     'jsonschema>=2.5,<3.0',
     'unicodecsv>=0.14,<2.0',
     'jsonpointer>=1.10,<2.0',
@@ -80,5 +80,6 @@ def read(*paths):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
 )
diff --git a/tests/test_infer.py b/tests/test_infer.py
@@ -28,4 +28,4 @@ def test_infer():
 
 def test_infer_non_utf8_file():
     descriptor = infer('data/data_with_accents.csv')
-    assert descriptor['resources'][0]['encoding'] == 'windows-1252'
+    assert descriptor['resources'][0]['encoding'] == 'iso-8859-1'
diff --git a/tox.ini b/tox.ini
@@ -6,6 +6,7 @@ envlist=
   py34
   py35
   py36
+  py37
 
 [testenv]
 deps=
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ envlist= @@
       py34
       py35
       py36
+      py37
     [testenv]
     deps=
@@ Expand Down @@