Merge 11f8b69 into 34423d9

.travis.yml

@@ -1,10 +1,10 @@
-dist: xenial
+dist: focal
 
 language: python
 python:
-  - 3.6
-  - 3.7
-  - 3.8
+  - "3.8"
+  - "3.9"
+  - "3.10.0"
 
 cache:
   pip: true
@@ -16,8 +16,7 @@ env:
     - RANDOM_SEED=0
 
 before_install:
-  - curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
-  - source $HOME/.poetry/env
+  - curl -sSL https://install.python-poetry.org | python3 -
   - make doctor
 
 install:

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.0 (2022-09-18)
+
+- Dropped support for Python 3.6 and 3.7.
+
 # 2.3 (2022-01-20)
 
 - Updated the representation of `expect.anything` to simplify diffs.

Makefile

@@ -47,7 +47,7 @@ $(DEPENDENCIES): poetry.lock
 
 ifndef CI
 poetry.lock: pyproject.toml
-	poetry lock
+	poetry lock --no-update
 	@ touch $@
 endif
 
@@ -124,8 +124,7 @@ $(MKDOCS_INDEX): docs/requirements.txt mkdocs.yml docs/*.md
 	poetry run mkdocs build --clean --strict
 
 docs/requirements.txt: poetry.lock
-	@ poetry export --dev --without-hashes | grep mkdocs >> $@
-	@ poetry export --dev --without-hashes | grep pygments >> $@
+	poetry export --dev --without-hashes --output $@
 
 .PHONY: uml
 uml: install docs/*.png

docs/requirements.txt

@@ -1,4 +1,71 @@
-mkdocs==1.2.3; python_version >= "3.6"
-pygments==2.11.2; python_version >= "3.5"
-mkdocs==1.2.3; python_version >= "3.6"
-pygments==2.11.2; python_version >= "3.5"
+altgraph==0.17.2 ; python_version >= "3.8" and python_version < "4.0"
+appdirs==1.4.4 ; python_version >= "3.8" and python_version < "4.0"
+astroid==2.9.0 ; python_version >= "3.8" and python_version < "4.0"
+atomicwrites==1.4.0 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32"
+attrs==21.4.0 ; python_version >= "3.8" and python_version < "4.0"
+black==19.10b0 ; python_version >= "3.8" and python_version < "4.0"
+certifi==2021.10.8 ; python_version >= "3.8" and python_version < "4.0"
+charset-normalizer==2.0.10 ; python_version >= "3.8" and python_version < "4.0"
+click==8.0.3 ; python_version >= "3.8" and python_version < "4.0"
+colorama==0.3.9 ; python_version >= "3.8" and python_version < "4.0"
+coverage==6.2 ; python_version >= "3.8" and python_version < "4.0"
+coverage[toml]==6.2 ; python_version >= "3.8" and python_version < "4.0"
+coveragespace==3.1.1 ; python_version >= "3.8" and python_version < "4.0"
+docopt==0.6.2 ; python_version >= "3.8" and python_version < "4.0"
+freezegun==1.1.0 ; python_version >= "3.8" and python_version < "4.0"
+future==0.18.2 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32"
+ghp-import==2.0.2 ; python_version >= "3.8" and python_version < "4.0"
+idna==3.3 ; python_version >= "3.8" and python_version < "4.0"
+importlib-metadata==4.8.3 ; python_version >= "3.8" and python_version < "4.0"
+iniconfig==1.1.1 ; python_version >= "3.8" and python_version < "4.0"
+isort==4.3.21 ; python_version >= "3.8" and python_version < "4.0"
+jinja2==3.0.3 ; python_version >= "3.8" and python_version < "4.0"
+lazy-object-proxy==1.7.1 ; python_version >= "3.8" and python_version < "4.0"
+macfsevents==0.8.1 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "darwin"
+macholib==1.15.2 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "darwin"
+markdown==3.3.6 ; python_version >= "3.8" and python_version < "4.0"
+markupsafe==2.0.1 ; python_version >= "3.8" and python_version < "4.0"
+mccabe==0.6.1 ; python_version >= "3.8" and python_version < "4.0"
+mergedeep==1.3.4 ; python_version >= "3.8" and python_version < "4.0"
+minilog==2.0.1 ; python_version >= "3.8" and python_version < "4.0"
+mkdocs==1.2.3 ; python_version >= "3.8" and python_version < "4.0"
+mypy-extensions==0.4.3 ; python_version >= "3.8" and python_version < "4.0"
+mypy==0.931 ; python_version >= "3.8" and python_version < "4.0"
+nose==1.3.7 ; python_version >= "3.8" and python_version < "4.0"
+packaging==21.3 ; python_version >= "3.8" and python_version < "4.0"
+pathspec==0.9.0 ; python_version >= "3.8" and python_version < "4.0"
+pefile==2021.9.3 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32"
+platformdirs==2.4.0 ; python_version >= "3.8" and python_version < "4.0"
+pluggy==1.0.0 ; python_version >= "3.8" and python_version < "4.0"
+py==1.11.0 ; python_version >= "3.8" and python_version < "4.0"
+pydocstyle==6.1.1 ; python_version >= "3.8" and python_version < "4.0"
+pygments==2.11.2 ; python_version >= "3.8" and python_version < "4.0"
+pyinstaller-hooks-contrib==2021.5 ; python_version >= "3.8" and python_version < "4.0"
+pyinstaller==4.5.1 ; python_version >= "3.8" and python_version < "4.0"
+pylint==2.12.0 ; python_version >= "3.8" and python_version < "4.0"
+pync==2.0.3 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "darwin"
+pyparsing==3.0.6 ; python_version >= "3.8" and python_version < "4.0"
+pytest-cov==3.0.0 ; python_version >= "3.8" and python_version < "4.0"
+pytest-describe==1.0.0 ; python_version >= "3.8" and python_version < "4.0"
+pytest-random==0.02 ; python_version >= "3.8" and python_version < "4.0"
+pytest==6.2.5 ; python_version >= "3.8" and python_version < "4.0"
+python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "4.0"
+python-termstyle==0.1.10 ; python_version >= "3.8" and python_version < "4.0"
+pywin32-ctypes==0.2.0 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32"
+pyyaml-env-tag==0.1 ; python_version >= "3.8" and python_version < "4.0"
+pyyaml==6.0 ; python_version >= "3.8" and python_version < "4.0"
+regex==2021.11.10 ; python_version >= "3.8" and python_version < "4.0"
+requests==2.27.1 ; python_version >= "3.8" and python_version < "4.0"
+setuptools==65.3.0 ; python_version >= "3.8" and python_version < "4.0"
+six==1.16.0 ; python_version >= "3.8" and python_version < "4.0"
+sniffer==0.4.1 ; python_version >= "3.8" and python_version < "4.0"
+snowballstemmer==2.2.0 ; python_version >= "3.8" and python_version < "4.0"
+toml==0.10.2 ; python_version >= "3.8" and python_version < "4.0"
+tomli==1.2.3 ; python_version >= "3.8" and python_version < "4.0"
+typed-ast==1.5.1 ; python_version >= "3.8" and python_version < "4.0"
+types-setuptools==57.4.7 ; python_version >= "3.8" and python_version < "4.0"
+typing-extensions==4.0.1 ; python_version >= "3.8" and python_version < "4.0"
+urllib3==1.26.8 ; python_version >= "3.8" and python_version < "4"
+watchdog==2.1.6 ; python_version >= "3.8" and python_version < "4.0"
+wrapt==1.13.3 ; python_version >= "3.8" and python_version < "4.0"
+zipp==3.6.0 ; python_version >= "3.8" and python_version < "4.0"

expecter/__init__.py

@@ -10,14 +10,12 @@
 import pprint
 import sys
 from collections import OrderedDict
-
-import pytest
-from pkg_resources import DistributionNotFound, get_distribution
+from importlib.metadata import PackageNotFoundError, version
 
 
 try:
-    __version__ = get_distribution('pytest-expecter').version
-except DistributionNotFound:
+    __version__ = version('pytest-expecter')
+except PackageNotFoundError:
     __version__ = '(local)'
 
 

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "pytest-expecter"
-version = "2.3"
+version = "3.0"
 description = "Better testing with expecter and pytest."
 
 license = "BSD"
@@ -23,9 +23,9 @@ classifiers = [
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
     "Topic :: Software Development :: Testing",
 ]
 
@@ -35,7 +35,7 @@ packages = [
 
 [tool.poetry.dependencies]
 
-python = "^3.6"
+python = "^3.8"
 
 [tool.poetry.dev-dependencies]
 
@@ -62,6 +62,7 @@ coveragespace = "^3.1.1"
 # Documentation
 mkdocs = "^1.2.3"
 pygments = "*"
+jinja2 = "~3.0.3"
 
 # Tooling
 pyinstaller = "*"