From c3dde8dbb430b239dcee24eedfab7af460a023dc Mon Sep 17 00:00:00 2001 From: Jonathan Wright Date: Wed, 28 Feb 2024 23:05:16 -0600 Subject: [PATCH] update build version for epel9 --- disable-poetry-light.patch | 85 ++++++++++++++++++++++++++++++++++++++ python-dns-lexicon.spec | 12 +++++- 2 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 disable-poetry-light.patch diff --git a/disable-poetry-light.patch b/disable-poetry-light.patch new file mode 100644 index 0000000..1b71fb8 --- /dev/null +++ b/disable-poetry-light.patch @@ -0,0 +1,85 @@ +diff -uNr lexicon-3.17.0/pyproject.toml lexicon-3.17.0.mod/pyproject.toml +--- lexicon-3.17.0/pyproject.toml 2023-11-06 16:21:46.000000000 -0600 ++++ lexicon-3.17.0.mod/pyproject.toml 2024-02-01 04:28:53.861285119 -0600 +@@ -61,32 +61,6 @@ + # Extra "full" list must contain all other extras + full = ["boto3", "localzone", "softlayer", "zeep", "oci"] + +-[tool.poetry.group.dev.dependencies] +-esbonio = "*" +-packaging = "*" +-pytest = "*" +-pytest-cov = "*" +-pytest-xdist = "*" +-vcrpy = "*" +-# We add flake8 conditionally to recent Python version to get modern versions +-# of flake8 cleaned of several issues. It just means that linting cannot be done +-# on the initial release of Python 3.8 (version 3.8.0). This is a decent constraint. +-flake8 = { version = "*", python = ">=3.8.1" } +-isort = "*" +-tox = ">=4" +-black = "*" +-mypy = "*" +-toml = "*" +-types-PyYAML = "*" +-types-pytz = "*" +-types-requests = "*" +-types-toml = "*" +- +-[tool.poetry.group.docs.dependencies] +-sphinx = "*" +-sphinx_rtd_theme = "*" +-toml = "*" +- + [tool.poetry.scripts] + lexicon = "lexicon._private.cli:main" + +diff -uNr lexicon-3.17.0/setup.cfg lexicon-3.17.0.mod/setup.cfg +--- lexicon-3.17.0/setup.cfg 2023-11-06 16:21:46.000000000 -0600 ++++ lexicon-3.17.0.mod/setup.cfg 2024-02-01 04:05:39.191101574 -0600 +@@ -5,45 +5,3 @@ + [tox:tox] + envlist = cover,lint,mypy + isolated_build = true +- +-# Standard env will run all test available for all providers. +-[testenv] +-allowlist_externals = poetry +-extras = +- full +-setenv = +- PYTEST_ADDOPTS = {env:PYTEST_ADDOPTS:--numprocesses auto} +- PYTHONHASHSEED = 0 +-commands_pre = +- poetry install --extras full --no-root --sync +-commands = +- poetry run pytest tests/ \ +- --junitxml=junit/test-results.xml --dist=loadfile +- +-# Cover env will run all test available for all providers with coverage enabled. +-[testenv:cover] +-commands = +- poetry run pytest tests/ \ +- --junitxml=junit/test-results.xml --dist=loadfile \ +- --cov=lexicon --cov-report=term-missing --cov-report=xml +- +-# Light env will run all tests except for providers with optional dependencies. +-[testenv:light] +-extras = +-commands_pre = +- poetry install --no-root --sync +-commands = +- poetry run pytest tests/ \ +- --junitxml=junit/test-results.xml --dist=loadfile \ +- --xfail-providers-with-missing-deps +- +-# Lint env will check for code quality and errors, and fails if it does not match the minimal requirements. +-[testenv:lint] +-commands = +- poetry run flake8 src tests +- +- +-# Mypy env will check for types in the Lexicon codebase. +-[testenv:mypy] +-commands = +- poetry run mypy src tests diff --git a/python-dns-lexicon.spec b/python-dns-lexicon.spec index 689aec4..89b6f53 100644 --- a/python-dns-lexicon.spec +++ b/python-dns-lexicon.spec @@ -16,7 +16,7 @@ Version: 3.17.0 %endif Name: python-%{pypi_name} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Manipulate DNS records on various DNS providers in a standardized/agnostic way License: MIT @@ -27,6 +27,11 @@ BuildArch: noarch BuildRequires: python3-devel +# epel is missing full poetry and light packages needed for tests +%if 0%{?rhel >= 8} +#Patch: disable-poetry-light.patch +%endif + # required to run the test suite %if %{with tests} BuildRequires: python3-pytest @@ -137,7 +142,7 @@ rm -rf %{pypi_name}.egg-info %if %{with extras} %pyproject_buildrequires -r -t -e light -x gransy,localzone,oci,route53 %else -%pyproject_buildrequires -r -t -e light +%pyproject_buildrequires -r %endif @@ -211,6 +216,9 @@ rm -rf %{buildroot}%{python3_sitelib}/lexicon/tests # }}} %changelog +* Thu Feb 29 2024 Jonathan Wright - 3.17.0-4 +- Update spec for building on epel9 + * Fri Jan 26 2024 Fedora Release Engineering - 3.17.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild