Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Drop Python 2 support from Travis and setup #405

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

Merged
merged 2 commits into from
Nov 28, 2019
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
13 changes: 3 additions & 10 deletions 13 .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ language: python
python:
- "nightly"
- "pypy3"
- "pypy"
- "3.8"
- "3.7"
- "3.6"
- "3.5"
- "2.7"

cache: pip

Expand Down Expand Up @@ -39,9 +37,9 @@ after_success:

matrix:
include:
- &django_py27
name: "Django test (Python 2.7)"
python: "2.7"
- &django_py3
name: "Django 1.11 test (Python 3.7)"
python: "3.7"
install:
- pip install -U pip
- wget https://github.com/django/django/archive/1.11.18.tar.gz
Expand All @@ -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
6 changes: 2 additions & 4 deletions 6 metadata.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
version: 1.4.6
version_info: (1,4,6,'final',0)
version: 2.0.0dev1
version_info: (2,0,0,'dev',1)
description: Python interface to MySQL
author: Inada Naoki
author_email: songofacandy@gmail.com
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions 1 setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
]
metadata['long_description'] = readme
metadata['long_description_content_type'] = "text/markdown"
metadata['python_requires'] = '>=3.5'
setuptools.setup(**metadata)
12 changes: 3 additions & 9 deletions 12 setup_common.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
try:
# Python 2.x
from ConfigParser import SafeConfigParser
except ImportError:
# Python 3.x
from configparser import ConfigParser as SafeConfigParser
from configparser import ConfigParser as SafeConfigParser

def get_metadata_and_options():
config = SafeConfigParser()
Expand All @@ -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')
rel.write("""
with open("MySQLdb/release.py",'w') as rel:
rel.write("""
__author__ = "%(author)s <%(author_email)s>"
version_info = %(version_info)s
__version__ = "%(version)s"
""" % metadata)
rel.close()
5 changes: 1 addition & 4 deletions 5 setup_posix.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import os, sys
try:
from ConfigParser import SafeConfigParser
except ImportError:
from configparser import ConfigParser as SafeConfigParser
from configparser import ConfigParser as SafeConfigParser

# This dequote() business is required for some older versions
# of mysql_config
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.