Merge branch 'master' into sandbox

un33k · un33k · commit 870e8d46b53f · 2019-03-31T09:49:26.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,13 @@
-sudo: false
 language: python
+dist: xenial
 
 python:
   - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
-  - pypy
+  - "3.7"
+  - "pypy2.7-6.0"
 
 install:
   - pip install pip -U
diff --git a/setup.py b/setup.py
@@ -32,6 +32,7 @@
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`'Programming Language :: Python :: 3.4',`
`33`	`33`	`'Programming Language :: Python :: 3.5',`
`34`	`34`	`'Programming Language :: Python :: 3.6',`
	`35`	`+ 'Programming Language :: Python :: 3.7',`
`35`	`36`	`]`
`36`	`37`
`37`	`38`