Skip to content

Commit

Permalink
updates to supported python versions, fix testing import error (#26)
Browse files Browse the repository at this point in the history
* updates for test imports, python target versions, test config

* fix isort deprecation warning
  • Loading branch information
edaniszewski committed May 24, 2021
1 parent f84e4ee commit 4f5119f
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 23 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
language: python
python:
- "3.4"
- "3.5"
- "3.6"
- "3.7"
- "3.8"
- "3.9"

# Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs
matrix:
Expand Down
12 changes: 5 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""Setup for the pylint-quotes package."""

import os
from setuptools import setup, find_packages
from setuptools import setup

here = os.path.abspath(os.path.dirname(__file__))

Expand All @@ -21,9 +21,9 @@
author_email=about['__author_email__'],
url=about['__url__'],
install_requires=[
'pylint>=1.7.6',
'pylint>=2.8.0',
],
python_requires=">=3.4",
python_requires=">=3.6",
packages=['pylint_quotes'],
zip_safe=False,
classifiers=(
Expand All @@ -32,12 +32,10 @@
'License :: OSI Approved :: MIT License',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Topic :: Software Development',
'Topic :: Utilities'
),
Expand Down
5 changes: 1 addition & 4 deletions tests/test_smart_quotes.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
from pylint_quotes.checker import StringQuoteChecker
from pylint.testutils import Message, set_config

try:
from pylint.testutils import tokenize_str
except ImportError:
from pylint.testutils import _tokenize_str as tokenize_str
from pylint.testutils import _tokenize_str as tokenize_str

from utils import Q_DOUB, Q_SING, TRI_Q_SING, TRI_Q_DOUB, StringQuoteCheckerTestCase

Expand Down
5 changes: 1 addition & 4 deletions tests/test_string_literal.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
from pylint_quotes.checker import StringQuoteChecker
from pylint.testutils import Message, set_config

try:
from pylint.testutils import tokenize_str
except ImportError:
from pylint.testutils import _tokenize_str as tokenize_str
from pylint.testutils import _tokenize_str as tokenize_str

from utils import Q_DOUB, Q_SING, TRI_Q_SING, TRI_Q_DOUB, StringQuoteCheckerTestCase

Expand Down
5 changes: 1 addition & 4 deletions tests/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@

from pylint.testutils import CheckerTestCase

try:
from pylint.testutils import tokenize_str
except ImportError:
from pylint.testutils import _tokenize_str as tokenize_str
from pylint.testutils import _tokenize_str as tokenize_str

import astroid

Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist==py34,py35,py36,py37
envlist==py36,py37,py38,py39
skip_missing_interpreters=true

[testenv]
Expand All @@ -22,7 +22,7 @@ deps=
commands=
pylint pylint_quotes
flake8 --ignore E501 pylint_quotes
isort pylint_quotes -rc -c --diff
isort pylint_quotes -c --diff

[testenv:deps]
description=
Expand Down

0 comments on commit 4f5119f

Please sign in to comment.