Drop Python 2 support from Travis and setup (#405)

.travis.yml

@@ -5,12 +5,10 @@ language: python
 python:
   - "nightly"
   - "pypy3"
-  - "pypy"
   - "3.8"
   - "3.7"
   - "3.6"
   - "3.5"
-  - "2.7"
 
 cache: pip
 
@@ -39,9 +37,9 @@ after_success:
 
 matrix:
   include:
-    - &django_py27
+    - &django_py3
-      name: "Django test (Python 2.7)"
+      name: "Django 1.11 test (Python 3.7)"
-      python: "2.7"
+      python: "3.7"
       install:
         - pip install -U pip
         - wget https://github.com/django/django/archive/1.11.18.tar.gz
@@ -59,9 +57,4 @@ matrix:
         - cd django-1.11.18/tests/
         - ./runtests.py --parallel=1 --settings=test_mysql
 
-    - &django_py3
-      <<: *django_py27
-      name: "Django test (Python 3.7)"
-      python: "3.7"
-
 # vim: sw=2 ts=2 sts=2

metadata.cfg

@@ -1,6 +1,6 @@
 [metadata]
-version: 1.4.6
+version: 2.0.0dev1
-version_info: (1,4,6,'final',0)
+version_info: (2,0,0,'dev',1)
 description: Python interface to MySQL
 author: Inada Naoki
 author_email: songofacandy@gmail.com
@@ -19,8 +19,6 @@ classifiers:
         Operating System :: Unix
         Programming Language :: C
         Programming Language :: Python
-        Programming Language :: Python :: 2
-        Programming Language :: Python :: 2.7
         Programming Language :: Python :: 3
         Programming Language :: Python :: 3.5
         Programming Language :: Python :: 3.6

setup.py

@@ -19,4 +19,5 @@ metadata['ext_modules'] = [
 ]
 metadata['long_description'] = readme
 metadata['long_description_content_type'] = "text/markdown"
+metadata['python_requires'] = '>=3.5'
 setuptools.setup(**metadata)

setup_common.py

@@ -1,9 +1,4 @@
-try:
+from configparser import ConfigParser as SafeConfigParser
-    # Python 2.x
-    from ConfigParser import SafeConfigParser
-except ImportError:
-    # Python 3.x
-    from configparser import ConfigParser as SafeConfigParser
 
 def get_metadata_and_options():
     config = SafeConfigParser()
@@ -28,10 +23,9 @@ def enabled(options, option):
         raise ValueError("Unknown value %s for option %s" % (value, option))
 
 def create_release_file(metadata):
-    rel = open("MySQLdb/release.py",'w')
+    with open("MySQLdb/release.py",'w') as rel:
-    rel.write("""
+        rel.write("""
 __author__ = "%(author)s <%(author_email)s>"
 version_info = %(version_info)s
 __version__ = "%(version)s"
 """ % metadata)
-    rel.close()

setup_posix.py

@@ -1,8 +1,5 @@
 import os, sys
-try:
+from configparser import ConfigParser as SafeConfigParser
-    from ConfigParser import SafeConfigParser
-except ImportError:
-    from configparser import ConfigParser as SafeConfigParser
 
 # This dequote() business is required for some older versions
 # of mysql_config