Merge pull request #24 from nicoddemus/drop-py35-py36

Drop Python 3.5 and 3.6, add Python 3.10 and 3.11

Author: nicoddemus

.github/workflows/deploy.yml

@@ -0,0 +1,34 @@
+name: deploy
+
+on:
+  push:
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
+
+jobs:
+
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Build and Check Package
+      uses: hynek/[email protected]
+
+    - name: Download Package
+      uses: actions/download-artifact@v3
+      with:
+        name: Packages
+        path: dist
+
+    - name: Publish package to PyPI
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.pypi_token }}
+
+    - name: Set up Python
+      uses: actions/[email protected]
+      with:
+        python-version: "3.10"

.github/workflows/main.yml

@@ -0,0 +1,44 @@
+name: test
+
+on: [push, pull_request]
+
+# Cancel running jobs for the same workflow and branch.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        os: [ubuntu-latest, windows-latest]
+        include:
+          - python: "3.7"
+            tox_env: "py37"
+          - python: "3.8"
+            tox_env: "py38"
+          - python: "3.9"
+            tox_env: "py39"
+          - python: "3.10"
+            tox_env: "py310"
+          - python: "3.11"
+            tox_env: "py311"
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install tox
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade virtualenv tox
+    - name: Test
+      run: |
+        tox -e ${{ matrix.tox_env }}

.github/workflows/test.yml

@@ -1,12 +1,11 @@
-exclude: '^($|.*\.bin)'
 repos:
   - repo: https://github.com/ambv/black
-    rev: 19.3b0
+    rev: 23.1.0
     hooks:
       - id: black
         args: [--safe, --quiet]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.3
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

.pre-commit-config.yaml

@@ -1,3 +1,9 @@
+UNRELEASED
+----------
+
+* Added support for Python 3.10 and 3.11.
+* Dropped support for Python 3.5 and 3.6.
+
 0.1.2 (2020-12-11)
 ------------------
 

CHANGELOG.rst

@@ -10,7 +10,7 @@ pytest-reportlog
 .. |anaconda| image:: https://img.shields.io/conda/vn/conda-forge/pytest-reportlog.svg
     :target: https://anaconda.org/conda-forge/pytest-reportlog
 
-.. |ci| image:: https://github.com/pytest-dev/pytest-reportlog/workflows/build/badge.svg
+.. |ci| image:: https://github.com/pytest-dev/pytest-reportlog/workflows/test/badge.svg
   :target: https://github.com/pytest-dev/pytest-reportlog/actions
 
 .. |python| image:: https://img.shields.io/pypi/pyversions/pytest-reportlog.svg

README.rst

@@ -11,8 +11,8 @@
     packages=find_packages(where="src"),
     package_dir={"": "src"},
     platforms="any",
-    python_requires=">=3.5",
-    install_requires=["pytest>=5.2"],
+    python_requires=">=3.7",
+    install_requires=["pytest"],
     use_scm_version={"write_to": "src/pytest_reportlog/_version.py"},
     setup_requires=["setuptools_scm"],
     url="https://github.com/pytest-dev/pytest-reportlog",
@@ -30,11 +30,11 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
-        "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",
         "Topic :: Software Development :: Testing",
     ],
 )

setup.py

@@ -74,9 +74,7 @@ def pytest_collectreport(self, report):
         self._write_json_data(data)
 
     def pytest_terminal_summary(self, terminalreporter):
-        terminalreporter.write_sep(
-            "-", "generated report log file: {}".format(self._log_path)
-        )
+        terminalreporter.write_sep("-", f"generated report log file: {self._log_path}")
 
 
 def cleanup_unserializable(d: Dict[str, Any]) -> Dict[str, Any]:

src/pytest_reportlog/plugin.py

@@ -26,7 +26,7 @@ def test_fail():
 
     result = testdir.runpytest("--report-log", str(log_file))
     assert result.ret == pytest.ExitCode.TESTS_FAILED
-    result.stdout.fnmatch_lines(["* generated report log file: {}*".format(log_file)])
+    result.stdout.fnmatch_lines([f"* generated report log file: {log_file}*"])
 
     json_objs = [json.loads(x) for x in log_file.read_text().splitlines()]
     assert len(json_objs) == 10
@@ -68,7 +68,7 @@ def test_fail():
     """
     )
     fn = tmp_path / "result.log"
-    result = testdir.runpytest("-n2", "--report-log={}".format(fn))
+    result = testdir.runpytest("-n2", f"--report-log={fn}")
     result.stdout.fnmatch_lines("*1 failed, 1 passed*")
 
     lines = fn.read_text("UTF-8").splitlines()

tests/test_reportlog.py

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{35,36,37,38,39},linting
+envlist = py{37,38,39,310,311},linting
 
 [testenv]
 deps =