Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python 3.7 support + upgrade cchardet #227

Merged
merged 2 commits into from
Oct 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
],
)
2 changes: 1 addition & 1 deletion tests/test_infer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ envlist=
py34
py35
py36
py37

[testenv]
deps=
Expand Down