Merge branch 'master' into patch-1

V-E-O · May 19, 2020 · 0966879 · 0966879
2 parents 8c07d8e + 334531c
commit 0966879
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,11 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
-  - "3.3"
   - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
   - "pypy"
 install:
   - "pip install pytest pytest-cov pytest-pep8 coveralls"

diff --git a/setup.cfg b/setup.cfg
@@ -1,8 +1,9 @@
-[pytest]
+[bdist_wheel]
+universal = 1
+
+[tool:pytest]
 addopts = --pep8 --cov gb2260
 norecursedirs = .tox .git build data dist *.egg-info __pycache__
 pep8ignore =
     data/* ALL
     gb2260/data.py ALL
-[bdist_wheel]
-universal = 1