From 67ce5a3dfee0ee3ca2fbfdf99ab27cc9e89a13b4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 9 Jun 2022 07:36:18 -0600 Subject: [PATCH] Update to 1.0.0 --- .gitignore | 1 + python-fido2-mock.patch | 48 ---------------------------------------- python-fido2-setup.patch | 13 ----------- python-fido2.spec | 41 ++++++++++++++-------------------- sources | 2 +- 5 files changed, 19 insertions(+), 86 deletions(-) delete mode 100644 python-fido2-mock.patch delete mode 100644 python-fido2-setup.patch diff --git a/.gitignore b/.gitignore index b2cbf95..14f981a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /python-python-fido2-0.9.1.tar.gz /python-python-fido2-0.9.2.tar.gz /python-python-fido2-0.9.3.tar.gz +/python-fido2-1.0.0.tar.gz diff --git a/python-fido2-mock.patch b/python-fido2-mock.patch deleted file mode 100644 index d8ad5cd..0000000 --- a/python-fido2-mock.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up python-fido2-0.9.3/test/test_client.py.mock python-fido2-0.9.3/test/test_client.py ---- python-fido2-0.9.3/test/test_client.py.mock 2021-11-09 04:15:13.000000000 -0700 -+++ python-fido2-0.9.3/test/test_client.py 2022-05-19 20:47:06.165307669 -0600 -@@ -29,7 +29,7 @@ - - from __future__ import absolute_import, unicode_literals - --import mock -+from unittest import mock - import unittest - from threading import Event, Timer - from binascii import a2b_hex -diff -up python-fido2-0.9.3/test/test_ctap2.py.mock python-fido2-0.9.3/test/test_ctap2.py ---- python-fido2-0.9.3/test/test_ctap2.py.mock 2021-11-09 04:15:13.000000000 -0700 -+++ python-fido2-0.9.3/test/test_ctap2.py 2022-05-19 20:44:27.276937443 -0600 -@@ -45,7 +45,7 @@ from cryptography.hazmat.backends import - from cryptography.hazmat.primitives.asymmetric import ec - - import unittest --import mock -+from unittest import mock - - _AAGUID = a2b_hex("F8A011F38C0A4D15800617111F9EDC7D") - _INFO = a2b_hex( -diff -up python-fido2-0.9.3/test/test_pcsc.py.mock python-fido2-0.9.3/test/test_pcsc.py ---- python-fido2-0.9.3/test/test_pcsc.py.mock 2021-11-09 04:15:13.000000000 -0700 -+++ python-fido2-0.9.3/test/test_pcsc.py 2022-05-19 20:45:11.291317012 -0600 -@@ -28,7 +28,7 @@ - from __future__ import absolute_import, unicode_literals - - import unittest --import mock -+from unittest import mock - import sys - from fido2.hid import CTAPHID - -diff -up python-fido2-0.9.3/test/test_ctap1.py.mock python-fido2-0.9.3/test/test_ctap1.py ---- python-fido2-0.9.3/test/test_ctap1.py.mock 2021-11-09 04:15:13.000000000 -0700 -+++ python-fido2-0.9.3/test/test_ctap1.py 2022-05-19 20:49:43.312664818 -0600 -@@ -30,7 +30,7 @@ from __future__ import absolute_import, - from fido2.ctap1 import Ctap1, ApduError - from binascii import a2b_hex - import unittest --import mock -+from unittest import mock - - - class TestCtap1(unittest.TestCase): diff --git a/python-fido2-setup.patch b/python-fido2-setup.patch deleted file mode 100644 index 31ef1b1..0000000 --- a/python-fido2-setup.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 445aa54..7747cde 100755 ---- a/setup.py -+++ b/setup.py -@@ -54,7 +54,7 @@ setup( - url="https://github.com/Yubico/python-fido2", - python_requires=">=2.7.6,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*", - install_requires=["six", "cryptography>=1.5"], -- extras_require={':python_version < "3.4"': ["enum34"], "pcsc": ["pyscard"]}, -+ extras_require={"pcsc": ["pyscard"]}, - classifiers=[ - "License :: OSI Approved :: BSD License", - "License :: OSI Approved :: Apache Software License", diff --git a/python-fido2.spec b/python-fido2.spec index c70dddb..ff283e0 100644 --- a/python-fido2.spec +++ b/python-fido2.spec @@ -1,9 +1,7 @@ -%{?python_enable_dependency_generator} - %global srcname fido2 Name: python-%{srcname} -Version: 0.9.3 +Version: 1.0.0 Release: 1%{?dist} Summary: Functionality for FIDO 2.0, including USB device communication @@ -12,11 +10,7 @@ Summary: Functionality for FIDO 2.0, including USB device communication # public_suffix_list.dat is MPLv2 License: BSD and ASL 2.0 and MPLv2.0 URL: https://github.com/Yubico/python-fido2 -Source0: https://github.com/Yubico/python-%{srcname}/archive/%{version}/python-%{name}-%{version}.tar.gz -# Deal with old setuptools on EPEL7 -Patch0: python-fido2-setup.patch -# Use python 3.8's unittest.mock -Patch1: python-fido2-mock.patch +Source0: https://github.com/Yubico/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch %global _description\ @@ -40,17 +34,7 @@ For usage, see the examples/ directory. %package -n python%{python3_pkgversion}-%{srcname} Summary: %summary BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-cryptography -BuildRequires: python%{python3_pkgversion}-six -# For tests -BuildRequires: python%{python3_pkgversion}-pyfakefs >= 3.4 -%if %{undefined __pythondist_requires} -Requires: python%{python3_pkgversion}-cryptography -Recommends: python%{python3_pkgversion}-pyscard -Requires: python%{python3_pkgversion}-six -%endif -%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} +BuildRequires: python%{python3_pkgversion}-pytest %description -n python%{python3_pkgversion}-%{srcname} %_description @@ -58,11 +42,19 @@ Requires: python%{python3_pkgversion}-six %prep %autosetup -p1 + +%generate_buildrequires +%pyproject_buildrequires + + %build -%py3_build +%pyproject_wheel + %install -%py3_install +%pyproject_install +%pyproject_save_files %{srcname} + %check # EL8 has old python-cryptography that makes a few tests fail @@ -70,14 +62,15 @@ Requires: python%{python3_pkgversion}-six %{__python3} -m unittest discover -v %{?el8:|| :} -%files -n python%{python3_pkgversion}-%{srcname} +%files -n python%{python3_pkgversion}-%{srcname} -f %pyproject_files %license COPYING* %doc NEWS README.adoc examples -%{python3_sitelib}/%{srcname}-*.egg-info/ -%{python3_sitelib}/%{srcname}/ %changelog +* Thu Jun 09 2022 Orion Poplawski - 1.0.0-1 +- Update to 1.0.0 + * Fri May 20 2022 Orion Poplawski - 0.9.3-1 - Update to 0.9.3 (bz#2087023) diff --git a/sources b/sources index 597c1b8..b6059e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-python-fido2-0.9.3.tar.gz) = 76d121eaa64f62e96e80f151b9f526e04276feab035494c5cde4bb7ae35fbed9c7bbd73c1d22f309b26ece3b71b0532a7a01c5a2f10c09a843def4e9a7c0b04b +SHA512 (python-fido2-1.0.0.tar.gz) = 7c7d555f20b3c5cf917847f41dfdad949d8a07f3075202c37eb483ab6e3f90c45ec36d16d82e1f3cde1f3cf75498189dff2653288b0537b47cb1c0e3190f9bb5