Skip to content

Commit

Permalink
Merge pull request #50 from jamescooke/no-py-2
Browse files Browse the repository at this point in the history
Remove support for Python 2
  • Loading branch information
jamescooke committed Oct 27, 2018
2 parents 621b532 + 53ebb83 commit 2a2daee
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 73 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
language: python
python: 3.6
matrix:
include:
- python: 3.5
env: TOXENV=py35-install,py35-test,py35-lint
- python: 3.6
env: TOXENV=py36-install,py36-test,py36-lint
install: pip install tox
script: tox
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@ Unreleased_
See also `latest documentation
<https://flake8-aaa.readthedocs.io/en/latest/>`_.

Added
-----

* Python 3.5 now supported.

Removed
-------

* Python 2.7 support removed.

0.4.0_ - 2018/07/17
-------------------

Expand Down
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ venv:
virtualenv venv --python=python3
venv/bin/pip install -U pip

venv2:
virtualenv venv2 --python=python2
venv/bin/pip install -U pip

venv/bin/pip-sync: venv
venv/bin/pip install pip-tools

Expand All @@ -25,6 +21,8 @@ tox:
lint:
@echo "=== flake8 ==="
flake8 $(lint_files) examples
@echo "=== mypy ==="
mypy flake8_aaa --ignore-missing-imports
@echo "=== pylint ==="
./run_pylint.sh flake8_aaa
@echo "=== isort ==="
Expand Down
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@ Resources

* `Changelog <https://github.com/jamescooke/flake8-aaa/blob/master/CHANGELOG.rst>`_

Tested on Pythons 2.7 and 3.6.
Tested on Pythons 3.5 and 3.6. Python 2 supported up to `v0.4.0
<https://pypi.org/project/flake8-aaa/0.4.0/>`_.
2 changes: 0 additions & 2 deletions flake8_aaa/__about__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import, print_function, unicode_literals

__short_name__ = 'aaa'
__name__ = 'flake8-{}'.format(__short_name__)
__version__ = '0.4.0'
Expand Down
56 changes: 0 additions & 56 deletions requirements/test2.txt

This file was deleted.

5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import unicode_literals

import os

from setuptools import setup
Expand Down Expand Up @@ -46,9 +44,8 @@ def readme():
'Framework :: Flake8',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python',
],
Expand Down
7 changes: 2 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,13 @@
# ensure that unicode loads OK.

[tox]
envlist = py{27,36}-{install,test,lint}
envlist = py{35,36}-{install,test,lint}
[testenv]
deps =
py36-{test,mypy,lint}: -rrequirements/test.txt
py27-{test,lint}: -rrequirements/test2.txt
deps = -rrequirements/test.txt
commands =
install: flake8 --version
install: flake8 tests examples/good
test: pytest tests
mypy: mypy flake8_aaa --ignore-missing-imports
lint: make lint
setenv = IN_TOX = 1
whitelist_externals = make

0 comments on commit 2a2daee

Please sign in to comment.