Update dependencies

.github/workflows/main.yml

@@ -19,13 +19,13 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "pypy3"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "pypy-3.10"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: "actions/checkout@v2"
-      - uses: "actions/setup-python@v2"
+      - uses: "actions/checkout@v4"
+      - uses: "actions/setup-python@v5"
         with:
           python-version: "${{ matrix.python-version }}"
       - name: "Install dependencies"
@@ -37,14 +37,3 @@ jobs:
           python -m pip install --upgrade virtualenv tox tox-gh-actions          
       - name: "Run tox targets for ${{ matrix.python-version }}"
         run: "python -m tox"
-
-      - name: "Report to coveralls"
-        # coverage is only created in the py39 environment
-        # --service=github is a workaround for bug
-        # https://github.com/coveralls-clients/coveralls-python/issues/251
-        if: "matrix.python-version == '3.9'"
-        run: |
-          pip install coveralls
-          coveralls --service=github
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -9,6 +9,8 @@ __pycache__/
 
 # Virtualenv
 /env/
+/venv/
+/.venv/
 
 # Unit test / coverage reports
 .cache
@@ -19,3 +21,6 @@ htmlcov
 
 # Sphinx documentation
 /doc/build/
+
+# Editors
+.vscode

.pre-commit-config.yaml

@@ -1,15 +1,15 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 24.2.0
     hooks:
       - id: black
         args: [--line-length=80]
   - repo: https://github.com/PyCQA/flake8
-    rev: "3.8.4"
+    rev: 7.0.0
     hooks:
       - id: flake8
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.7.4
+    rev: v3.15.1
     hooks:
     - id: pyupgrade
-      args: [--py36-plus]
+      args: [--py38-plus]

CHANGES.rst

@@ -4,14 +4,26 @@ CHANGES
 0.4 (unreleased)
 ----------------
 
-- Fix Flake8.
+- **Removed**: Drop support for Python 3.4, 3.5, 3.6 and 3.7.
 
-- Drop support for Python 3.4 and 3.5.
+- Add support for Python 3.9, 3.10 and 3.11.
 
-- Add support for Python 3.9.
+- Fix Flake8.
 
 - Use GitHub Actions for CI.
 
+- Make Python 3.11 the default testing environment.
+
+- Upgrade PonyORM to 0.7.17.
+
+- Show full diffs in the test output.
+
+- Add Editors config and venv to .gitignore.
+
+- Remove report to coveralls.
+
+- Update pre-commit revs.
+
 
 0.3 (2020-04-26)
 ----------------
@@ -29,6 +41,8 @@ CHANGES
 - Add integration for the Black code formatter.
 
 
+
+
 0.2 (2017-07-20)
 ----------------
 

README.rst

@@ -2,9 +2,6 @@
    :target: https://github.com/morepath/more.pony/actions?workflow=CI
    :alt: CI Status
 
-.. image:: https://coveralls.io/repos/github/morepath/more.pony/badge.svg?branch=master
-    :target: https://coveralls.io/github/morepath/more.pony?branch=master
-
 .. image:: https://img.shields.io/pypi/v/more.pony.svg
   :target: https://pypi.org/project/more.pony/
 

develop_requirements.txt

@@ -1,5 +1,5 @@
 # development
--e '.[test,coverage,pep8]'
+-e '.[test,coverage,lint]'
 pre-commit
 tox >= 2.4.1
 

pyproject.toml

@@ -0,0 +1,18 @@
+[tool.black]
+line-length = 80
+target-version = ['py38', 'py39', 'py310', 'py311']
+include = '\.pyi?$'
+exclude = '''
+(
+  /(
+      \.git
+    | \.vscode
+    | \.tox
+    | .venv
+    | env
+    | venv
+    | build
+    | dist
+  )/
+)
+'''

setup.cfg

@@ -5,7 +5,9 @@ max-line-length = 88
 
 [tool:pytest]
 testpaths = more
-addopts = -v
+addopts = -vv
+filterwarnings =
+  ignore:.*slated for removal in Python 3.13.*:DeprecationWarning
 
 [coverage:run]
 source = more.pony

setup.py

@@ -23,16 +23,21 @@
     classifiers=[
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
-        "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",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],
-    install_requires=["morepath >= 0.19", "pony >= 0.7.13"],
+    install_requires=["morepath >= 0.19", "pony >= 0.7.17"],
     extras_require=dict(
-        test=["pytest >= 2.9.1", "pytest-remove-stale-bytecode", "webtest"],
+        test=[
+            "pytest >= 2.9.1",
+            "pytest-remove-stale-bytecode",
+            "webtest",
+            "pygments",
+        ],
         coverage=["pytest-cov"],
-        pep8=["flake8", "black"],
+        lint=["flake8", "black"],
     ),
 )

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py36, py37, py38, py39, pypy3, pre-commit, coverage
+envlist = py38, py39, py310, py311, pypy3, pre-commit, coverage
 skip_missing_interpreters = True
 
 [testenv]
@@ -13,18 +13,19 @@ deps = pre-commit
 commands = pre-commit run --all-files
 
 [testenv:coverage]
-basepython = python3
+basepython = python3.11
 extras = test
          coverage
 
 commands = pytest --cov --cov-fail-under=100 {posargs}
 
 [gh-actions]
 python =
-    3.6: py36
-    3.7: py37
     3.8: py38
-    3.9: py39, pre-commit, mypy, coverage
+    3.9: py39
+    3.10: py310
+    3.11: py311, pre-commit, coverage
+    pypy-3.10: pypy3
 
 [flake8]
 max-line-length = 88