BREAK: remove 2.7 support; remove docker; use travis python

Author: aikikode

.travis.yml

@@ -1,11 +1,11 @@
 language: python
-sudo: required
-services:
-- docker
-script:
-- make docker/build
-before_install:
-- pip install codecov
+python:
+  - "3.6"
+  - "3.7"
+  - "3.8"
+script: tox
+install:
+- pip install codecov tox-travis
 after_success:
 - codecov
 deploy:

Dockerfile

@@ -1,10 +1,7 @@
 # This Makefile requires the following commands to be available:
 # * python3.6
-# * docker
-# * docker-compose
 
 DEPS:=requirements.txt
-DOCKER_COMPOSE:=$(shell which docker-compose)
 
 PIP:="venv/bin/pip"
 CMD_FROM_VENV:=". venv/bin/activate; which"
@@ -31,7 +28,7 @@ venv:
 	@python3.6 -m venv venv
 	@$(PIP) install -U "pip>=7.0" -q
 	@$(PIP) install -U setuptools -q
-	@$(PIP) install --use-feature=2020-resolver -r $(DEPS)
+	@$(PIP) install -r $(DEPS)
 
 test: venv pyclean
 	$(TOX) -e $(TOX_PY_LIST)
@@ -42,21 +39,18 @@ test/%: venv pyclean
 lint: venv
 	@$(TOX) -e isort-check
 	@$(TOX) -e flake8
+	@$(TOX) -e black
 
 isort: venv
 	@$(TOX) -e isort-fix
 
-docker:
-	$(DOCKER_COMPOSE) run --rm --service-ports app bash
-
-docker/%:
-	$(DOCKER_COMPOSE) run --rm --service-ports app make $*
-
 ## Distribution
-build: venv tox
+.PHONY: build
+build: venv
 	-rm -rf dist build
 	$(PYTHON) setup.py sdist bdist_wheel
 	$(TWINE) check dist/*
 
+.PHONY: publish
 publish: build
 	$(TWINE) upload dist/*

Makefile

@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 120
-target_version = ["py27", "py35", "py36", "py37"]
+target_version = ["py36", "py37", "py38"]
 
 [tool.isort]
 combine_as_imports = true

docker-compose.yml

@@ -1,7 +1,8 @@
 # Package in develop mode
 -e .
 
-importlib-metadata
+# Latest tox (3.20.1 at the moment) requires importlib-metadata<3,>=0.12
+importlib-metadata<3
 
 # Distribution
 twine
@@ -11,9 +12,10 @@ wheel
 mypy; python_version >= '3.5'
 isort[pyproject]
 flake8
+black; python_version >= '3.6'
 
 # Tests
-tox
+tox==3.20.1
 pytest
 pytest-cov
 pytest-asyncio; python_version >= '3.5'

pyproject.toml

@@ -26,8 +26,6 @@
         "Intended Audience :: Developers",
         "Operating System :: OS Independent",
         "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",

requirements.txt

@@ -2,32 +2,40 @@
 addopts=--tb=short
 
 [tox]
-envlist = isort-check,isort-fix,flake8,py27,py35,py36
+envlist = isort-check,isort-fix,flake8,black,py36,py37,py38,build-check
 
 [testenv]
 passenv = *
-install_command = pip install --use-feature=2020-resolver {opts} {packages}
+install_command = pip install {opts} {packages}
 commands =
     coverage run -m pytest tests {posargs}
     coverage xml -i -o coverage.{envname}.xml
 deps =
     -rrequirements.txt
 
-[testenv:py27]
-setenv =
-    PYTEST_ADDOPTS = --ignore tests/test_fqn_decorators_asynchronous.py
-deps =
-    {[testenv]deps}
-
 [testenv:flake8]
 basepython = python3.6
 commands = flake8 fqn_decorators tests setup.py --exclude=fqn_decorators/__init__.py
 deps = flake8
 
+[testenv:black]
+basepython = python3.6
+commands = black fqn_decorators tests setup.py --exclude=fqn_decorators/__init__.py
+deps = black
+
 [testenv:isort-check]
 commands = isort -c fqn_decorators tests setup.py
 deps = isort
 
 [testenv:isort-fix]
 commands = isort fqn_decorators tests setup.py
 deps = isort
+
+[testenv:build-check]
+basepython = python3.6
+commands =
+    rm -rf dist build
+    python setup.py sdist bdist_wheel
+    twine check dist/*
+deps = twine
+allowlist_externals = /bin/rm