Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Install python 3.9
- name: Install python 3.11
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: 3.11
architecture: x64

- name: Install noxfile requirements
Expand Down Expand Up @@ -130,10 +130,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Install python 3.9 for nox
- name: Install python 3.11 for nox
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: 3.11
architecture: x64

- name: Install noxfile requirements
Expand All @@ -158,10 +158,10 @@ jobs:
fetch-depth: 0 # so that gh-deploy works
# persist-credentials: false # see https://github.com/orgs/community/discussions/25702

- name: Install python 3.9 for nox
- name: Install python 3.11 for nox
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: 3.11
architecture: x64

# 1) retrieve the reports generated previously
Expand Down
2 changes: 1 addition & 1 deletion docs/long_description.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pytest-harvest

[![Python versions](https://img.shields.io/pypi/pyversions/pytest-harvest.svg)](https://pypi.python.org/pypi/pytest-harvest/) [![Build Status](https://github.com/smarie/python-pytest-harvest/actions/workflows/base.yml/badge.svg)](https://github.com/smarie/python-pytest-harvest/actions/workflows/base.yml) [![Tests Status](https://smarie.github.io/python-pytest-harvest/reports/junit/junit-badge.svg?dummy=8484744)](https://smarie.github.io/python-pytest-harvest/reports/junit/report.html) [![codecov](https://codecov.io/gh/smarie/python-pytest-harvest/branch/master/graph/badge.svg)](https://codecov.io/gh/smarie/python-pytest-harvest)
[![Python versions](https://img.shields.io/pypi/pyversions/pytest-harvest.svg)](https://pypi.python.org/pypi/pytest-harvest/) ![Pytest versions](https://img.shields.io/badge/pytest-6%20%7C%207%20%7C%208-blue) [![Build Status](https://github.com/smarie/python-pytest-harvest/actions/workflows/base.yml/badge.svg)](https://github.com/smarie/python-pytest-harvest/actions/workflows/base.yml) [![Tests Status](https://smarie.github.io/python-pytest-harvest/reports/junit/junit-badge.svg?dummy=8484744)](https://smarie.github.io/python-pytest-harvest/reports/junit/report.html) [![codecov](https://codecov.io/gh/smarie/python-pytest-harvest/branch/master/graph/badge.svg)](https://codecov.io/gh/smarie/python-pytest-harvest)

[![Documentation](https://img.shields.io/badge/doc-latest-blue.svg)](https://smarie.github.io/python-pytest-harvest/) [![PyPI](https://img.shields.io/pypi/v/pytest-harvest.svg)](https://pypi.python.org/pypi/pytest-harvest/) [![Downloads](https://pepy.tech/badge/pytest-harvest)](https://pepy.tech/project/pytest-harvest) [![Downloads per week](https://pepy.tech/badge/pytest-harvest/week)](https://pepy.tech/project/pytest-harvest) [![GitHub stars](https://img.shields.io/github/stars/smarie/python-pytest-harvest.svg)](https://github.com/smarie/python-pytest-harvest/stargazers)

Expand Down
28 changes: 19 additions & 9 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,24 @@ class Folders:
ENVS = {
# python 3.14 - numpy is not available in precompiled version for this python version yet
# (PY314, "pytest-latest"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": ""}},
# (PY314, "pytest7.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<8"}},
# (PY314, "pytest6.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<7"}},
# python 3.13
(PY313, "pytest-latest"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": ""}},
(PY313, "pytest7.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<8"}},
(PY313, "pytest6.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<7"}},
# python 3.12
(PY312, "pytest-latest"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": ""}},
(PY312, "pytest7.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<8"}},
(PY312, "pytest6.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<7"}},
# python 3.11
# We'll run this last for coverage
# We'll run 'pytest-latest' this last for coverage
(PY311, "pytest7.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<8"}},
(PY311, "pytest6.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<7"}},
# python 3.10
(PY310, "pytest-latest"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": ""}},
(PY310, "pytest7.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<8"}},
(PY310, "pytest6.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<7"}},
# python 3.9
(PY39, "pytest-latest"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": ""}},
(PY39, "pytest7.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<8"}},
Expand Down Expand Up @@ -166,7 +175,7 @@ def tests(session, coverage, pkg_specs):
session.run("genbadge", "coverage", "-i", f"{Folders.coverage_xml}", "-o", f"{Folders.coverage_badge}")


@nox.session(python=PY39)
@nox.session(python=PY311)
def flake8(session):
"""Launch flake8 qualimetry."""

Expand All @@ -187,7 +196,7 @@ def flake8(session):
rm_file(Folders.flake8_intermediate_file)


@nox.session(python=PY39)
@nox.session(python=PY311)
def docs(session):
"""Generates the doc. Pass '-- serve' to serve it on a local http server instead."""

Expand All @@ -200,7 +209,7 @@ def docs(session):
session.run("mkdocs", "build")


@nox.session(python=PY39)
@nox.session(python=PY311)
def publish(session):
"""Deploy the docs+reports on github pages. Note: this rebuilds the docs"""

Expand Down Expand Up @@ -245,18 +254,19 @@ def my_scheme(version_):

session.run("python", "setup.py", "sdist", "bdist_wheel")

# Make sure that the generated _version.py file exists and is compliant with python 2.7
# Make sure that the generated _version.py file exists
version_py = Path(f"src/{pkg_name}/_version.py")
if not version_py.exists():
raise ValueError("Error with setuptools_scm: _version.py file not generated")

if ":" in version_py.read_text():
raise ValueError("Error with setuptools_scm: _version.py file contains annotations")
# ...and is compliant with python 2.7
# if ":" in version_py.read_text():
# raise ValueError("Error with setuptools_scm: _version.py file contains annotations")

return current_tag, version


@nox.session(python=PY39)
@nox.session(python=PY311)
def build(session):
"""Same as release but just builds"""

Expand All @@ -265,7 +275,7 @@ def build(session):
print(f"version: {version}")


@nox.session(python=PY39)
@nox.session(python=PY311)
def release(session):
"""Create a release on github corresponding to the latest tag"""

Expand Down
9 changes: 1 addition & 8 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ classifiers =
Topic :: Software Development :: Libraries :: Python Modules
Topic :: Software Development :: Testing
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
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
Expand All @@ -44,7 +37,7 @@ install_requires =
makefun>=1.5

tests_require =
pytest<8.4.0
pytest
numpy
pandas
tabulate
Expand Down
Loading