From 5e9310e208e24e6e5e71f5fbfc05d668e11b9d5d Mon Sep 17 00:00:00 2001 From: Felix Schwarz Date: Thu, 19 Aug 2021 22:34:46 +0200 Subject: [PATCH] update to 3.7.0 --- 0000-remove-shebang.patch | 6 +++--- python-dns-lexicon.spec | 43 +++++++++++++-------------------------- sources | 2 +- 3 files changed, 18 insertions(+), 33 deletions(-) diff --git a/0000-remove-shebang.patch b/0000-remove-shebang.patch index 77bcdec..fd58558 100644 --- a/0000-remove-shebang.patch +++ b/0000-remove-shebang.patch @@ -1,9 +1,9 @@ diff --git a/lexicon/cli.py b/lexicon/cli.py -index d2e2a41..3b6ba67 100644 +index ed2f0ef..73e88ef 100644 --- a/lexicon/cli.py +++ b/lexicon/cli.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python """Module for Lexicon command-line interface""" - from __future__ import absolute_import, print_function - + import json + import logging diff --git a/python-dns-lexicon.spec b/python-dns-lexicon.spec index 60d06eb..eca29f5 100644 --- a/python-dns-lexicon.spec +++ b/python-dns-lexicon.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/AnalogJ/lexicon -Version: 3.5.3 +Version: 3.7.0 %forgemeta %global pypi_name dns-lexicon @@ -17,7 +17,7 @@ Version: 3.5.3 %endif Name: python-%{pypi_name} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Manipulate DNS records on various DNS providers in a standardized/agnostic way License: MIT @@ -29,12 +29,9 @@ BuildArch: noarch Patch0: 0000-remove-shebang.patch BuildRequires: pyproject-rpm-macros -BuildRequires: poetry >= 0.12 -BuildRequires: python3-pyparsing >= 2.0.2 -BuildRequires: python3-six +BuildRequires: poetry >= 1.0.0 # required to run the test suite -BuildRequires: python3-mock BuildRequires: python3-pytest BuildRequires: python3-pytest-vcr @@ -55,13 +52,6 @@ library. Summary: %{summary} %{?python_provide:%python_provide python3-%{pypi_name}} -Requires: python3-cryptography -Requires: python3-future -Requires: python3-requests -Requires: python3-setuptools -Requires: python3-pyOpenSSL -Requires: python3-tldextract -Requires: python3-pyyaml # Both packages install a Python module named lexicon # TODO: Remove this once resolved upstream (see upstream #222) @@ -86,6 +76,11 @@ Provides: python%{python3_version}dist(%{pypi_name}[henet]) = %{version} Obsoletes: python3-%{pypi_name}+hetzner < 3.4 Provides: python3dist(%{pypi_name}[hetzner]) = %{version} Provides: python%{python3_version}dist(%{pypi_name}[hetzner]) = %{version} + +# lexicon 3.6.0 removed the xmltodict dependency (and the "plesk" extra) +Obsoletes: python3-%{pypi_name}+plesk < 3.6 +Provides: python3dist(%{pypi_name}[plesk]) = %{version} +Provides: python%{python3_version}dist(%{pypi_name}[plesk]) = %{version} %endif # }}} @@ -97,18 +92,6 @@ library. This is the Python 3 version of the package. -%package -n python3-%{pypi_name}+plesk -Summary: Meta-package for python3-%{pypi_name} and Plesk provider -%{?python_provide:%python_provide python3-%{pypi_name}+plesk} - -Requires: python3-%{pypi_name} = %{version}-%{release} -Requires: python3-xmltodict - -%description -n python3-%{pypi_name}+plesk -This package installs no files. It requires python3-%{pypi_name} and all -dependencies necessary to use the Plesk provider. - - %package -n python3-%{pypi_name}+route53 Summary: Meta-package for python3-%{pypi_name} and Route 53 provider %{?python_provide:%python_provide python3-%{pypi_name}+route53} @@ -127,7 +110,7 @@ rm -rf %{pypi_name}.egg-info rm setup.py %generate_buildrequires -%pyproject_buildrequires -r -t -e light -x route53,plesk +%pyproject_buildrequires -r -t -e light -x route53 %build @@ -145,7 +128,8 @@ rm setup.py # - NamecheapManagedProviderTests # - GransyProviderTests # - LocalzoneProviderTests -TEST_SELECTOR="not AutoProviderTests and not GoDaddyProviderTests and not TransipProviderTests and not SoftLayerProviderTests and not NamecheapProviderTests and not NamecheapManagedProviderTests and not GransyProviderTests and not LocalzoneProviderTests" +# - OciProviderTests +TEST_SELECTOR="not AutoProviderTests and not GoDaddyProviderTests and not TransipProviderTests and not SoftLayerProviderTests and not NamecheapProviderTests and not NamecheapManagedProviderTests and not GransyProviderTests and not LocalzoneProviderTests and not OciProviderTests" # EPEL 8 does not provide the python3-pytest-vcr package %if 0%{?fedora} # The %%tox macro lacks features so we need to use pytest directly: @@ -175,8 +159,6 @@ rm -rf %{buildroot}%{python3_sitelib}/lexicon/tests # Extras meta-packages # {{{ %if %{with extras} -%files -n python3-%{pypi_name}+plesk -%{?python_extras_subpkg:%ghost %{python3_sitelib}/dns_lexicon-%{version}.dist-info} %files -n python3-%{pypi_name}+route53 %{?python_extras_subpkg:%ghost %{python3_sitelib}/dns_lexicon-%{version}.dist-info} @@ -185,6 +167,9 @@ rm -rf %{buildroot}%{python3_sitelib}/lexicon/tests # }}} %changelog +* Thu Aug 19 2021 Felix Schwarz - 3.7.0-1 +- update to 3.7.0 + * Fri Jul 23 2021 Fedora Release Engineering - 3.5.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 6079f10..286ae5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lexicon-3.5.3.tar.gz) = 98cc7a4099998ed6d3195f345ac59a71b8281ed3b3c61484da39175697fb7f48a6855b2f71467c38bdef0da4b107dc39333de552ab81f4aed8687f13ed0c24ea +SHA512 (lexicon-3.7.0.tar.gz) = aabfb2460bc2665b57552e6267846a0f2e508661dfdefbd22adca5833f32e8034198d1c3d5c33b2b89fb4a0cf0e9a84ec7d90426a6d8ba78acf2f2d0748c2d65