From 94bdf8ea1788e1168e291f8532bcca9c5678d501afe8a66611a50e07dc2b9160 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 1 Nov 2024 05:38:02 +0000 Subject: [PATCH 1/3] Accepting request 1219876 from home:pgajdos - version update to 0.7.0 * This release is the first to drop Python 2 support. For Python 2 users, use <= 0.6.0. * CI improvements from @Borda including dependabot and an expanded build matrix * adding GH dependabot by @Borda in #432 * Bump the pip group with 2 updates by @dependabot in #491 * Update hypothesis requirement from <6.62.0 to <6.100.0 in /.github/scripts by @dependabot in #492 * #444: Removed pipes dependency by @BasedDepartment1 in #447 * Update termcolor requirement from <2.2.0 to <2.5.0 in /.github/scripts by @dependabot in #493 * Update mock requirement from <5.0.0 to <6.0.0 in /.github/scripts by @dependabot in #495 * Update pytest requirement from <=7.2.1 to <=8.1.1 in /.github/scripts by @dependabot in #494 * Update pytest-runner requirement from <6.0.0 to <7.0.0 in /.github/scripts by @dependabot in #496 * fix typo in dependabot group by @Borda in #497 * Update setuptools requirement from <=69.1.1 to <=69.2.0 in /.github/scripts by @dependabot in #500 * Update hypothesis requirement from <6.100.0 to <6.101.0 in /.github/scripts by @dependabot in #506 * Update levenshtein requirement from <=0.25.0 to <=0.25.1 in /.github/scripts by @dependabot in #510 * Use ast.Constant for recent Python versions by @wdhongtw in #526 * Remove future imports now that we've dropped support for Python 2 by @dbieber in #539 * remove six: Replace six.string_types and six.integer_types, etc. by @dbieber in #541 * Remove sys.version_info checks by @dbieber in #542 * Update setuptools requirement from <=69.2.0 to <=75.1.0 in /.github/scripts by @dependabot in #540 * Simplify requirements.txt by assuming Python 3 by @dbieber in #543 * Update hypothesis requirement from <6.101.0 to <6.113.0 in /.github/scripts by @dependabot in #544 * Remove mock in favor of unittest.mock by @dbieber in #545 * Update pytest requirement from <=8.1.1 to <=8.3.3 in /.github/scripts by @dependabot in #546 * Update label used by dependabot by @dbieber in #547 * Update levenshtein requirement from <=0.25.1 to <=0.26.0 in /.github/scripts by @dependabot in #548 * Upgrade pylint version by @dbieber in #549 * Run github action on pull_request by @dbieber in #550 * Add current system MSYS check by @bonfy in #278 * Remove .format in favor of f-strings by @dbieber in #551 OBS-URL: https://build.opensuse.org/request/show/1219876 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-fire?expand=0&rev=25 --- fire-0.5.0.tar.gz | 3 --- fire-0.7.0.tar.gz | 3 +++ python-fire.changes | 42 ++++++++++++++++++++++++++++++++++++++++++ python-fire.spec | 11 ++++------- 4 files changed, 49 insertions(+), 10 deletions(-) delete mode 100644 fire-0.5.0.tar.gz create mode 100644 fire-0.7.0.tar.gz diff --git a/fire-0.5.0.tar.gz b/fire-0.5.0.tar.gz deleted file mode 100644 index 85a8c6a..0000000 --- a/fire-0.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6b0d49e98c8963910021f92bba66f65ab440da2982b78eb1bbf95a0a34aacc6 -size 88282 diff --git a/fire-0.7.0.tar.gz b/fire-0.7.0.tar.gz new file mode 100644 index 0000000..8edc85c --- /dev/null +++ b/fire-0.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:961550f07936eaf65ad1dc8360f2b2bf8408fad46abbfa4d2a3794f8d2a95cdf +size 87189 diff --git a/python-fire.changes b/python-fire.changes index ff5810b..2ec11e1 100644 --- a/python-fire.changes +++ b/python-fire.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Thu Oct 31 14:31:28 UTC 2024 - pgajdos@suse.com + +- version update to 0.7.0 + * This release is the first to drop Python 2 support. For Python 2 users, use <= 0.6.0. + * CI improvements from @Borda including dependabot and an expanded build matrix + * adding GH dependabot by @Borda in #432 + * Bump the pip group with 2 updates by @dependabot in #491 + * Update hypothesis requirement from <6.62.0 to <6.100.0 in /.github/scripts by @dependabot in #492 + * #444: Removed pipes dependency by @BasedDepartment1 in #447 + * Update termcolor requirement from <2.2.0 to <2.5.0 in /.github/scripts by @dependabot in #493 + * Update mock requirement from <5.0.0 to <6.0.0 in /.github/scripts by @dependabot in #495 + * Update pytest requirement from <=7.2.1 to <=8.1.1 in /.github/scripts by @dependabot in #494 + * Update pytest-runner requirement from <6.0.0 to <7.0.0 in /.github/scripts by @dependabot in #496 + * fix typo in dependabot group by @Borda in #497 + * Update setuptools requirement from <=69.1.1 to <=69.2.0 in /.github/scripts by @dependabot in #500 + * Update hypothesis requirement from <6.100.0 to <6.101.0 in /.github/scripts by @dependabot in #506 + * Update levenshtein requirement from <=0.25.0 to <=0.25.1 in /.github/scripts by @dependabot in #510 + * Use ast.Constant for recent Python versions by @wdhongtw in #526 + * Remove future imports now that we've dropped support for Python 2 by @dbieber in #539 + * remove six: Replace six.string_types and six.integer_types, etc. by @dbieber in #541 + * Remove sys.version_info checks by @dbieber in #542 + * Update setuptools requirement from <=69.2.0 to <=75.1.0 in /.github/scripts by @dependabot in #540 + * Simplify requirements.txt by assuming Python 3 by @dbieber in #543 + * Update hypothesis requirement from <6.101.0 to <6.113.0 in /.github/scripts by @dependabot in #544 + * Remove mock in favor of unittest.mock by @dbieber in #545 + * Update pytest requirement from <=8.1.1 to <=8.3.3 in /.github/scripts by @dependabot in #546 + * Update label used by dependabot by @dbieber in #547 + * Update levenshtein requirement from <=0.25.1 to <=0.26.0 in /.github/scripts by @dependabot in #548 + * Upgrade pylint version by @dbieber in #549 + * Run github action on pull_request by @dbieber in #550 + * Add current system MSYS check by @bonfy in #278 + * Remove .format in favor of f-strings by @dbieber in #551 + * Remove six from console, eliminates six entirely by @dbieber in #552 + * Move asyncio imports and update docs by @dbieber in #553 + * Include Python 3.13 in github actions by @dbieber in #554 + * Continue upgrade of codebase to Python 3 by @dbieber in #556 + * update required Python 3.7 in setup.py by @Borda in #555 + * Lint improvements and type safety by @dbieber in #558 + * ci: expand build matrix for major OS by @Borda in #490 + * Replace Python 2 type hints with real type annotations by @dbieber in #559 + ------------------------------------------------------------------- Tue Feb 7 01:05:45 UTC 2023 - Steve Kowalik diff --git a/python-fire.spec b/python-fire.spec index 82b69ef..4b7fd50 100644 --- a/python-fire.spec +++ b/python-fire.spec @@ -1,7 +1,7 @@ # # spec file for package python-fire # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,26 +18,22 @@ %define skip_python2 1 Name: python-fire -Version: 0.5.0 +Version: 0.7.0 Release: 0 Summary: A library for automatically generating command line interfaces License: Apache-2.0 URL: https://github.com/google/python-fire Source: https://files.pythonhosted.org/packages/source/f/fire/fire-%{version}.tar.gz # Based on https://github.com/google/python-fire/pull/265/files -Patch0: python-fire-no-mock.patch -Patch1: support-python-311.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-six Requires: python-termcolor BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module Levenshtein} BuildRequires: %{python_module hypothesis} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module six} BuildRequires: %{python_module termcolor} # /SECTION %python_subpackages @@ -61,6 +57,7 @@ interfaces (CLIs) from a Python object. %files %{python_files} %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/fire +%{python_sitelib}/fire-*.egg-info %changelog From 152c0ff7a18839fdb5d110a574a990825720a17a8f5ede0fa7462f875f394dff Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 12 Nov 2024 00:31:48 +0000 Subject: [PATCH 2/3] - Replace upstreamed patch: - python-fire-no-mock.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-fire?expand=0&rev=26 --- python-fire-no-mock.patch | 81 --------------------------------------- python-fire.changes | 2 + 2 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 python-fire-no-mock.patch diff --git a/python-fire-no-mock.patch b/python-fire-no-mock.patch deleted file mode 100644 index 59f95db..0000000 --- a/python-fire-no-mock.patch +++ /dev/null @@ -1,81 +0,0 @@ -Index: fire-0.5.0/fire/core_test.py -=================================================================== ---- fire-0.5.0.orig/fire/core_test.py -+++ fire-0.5.0/fire/core_test.py -@@ -22,7 +22,11 @@ from fire import core - from fire import test_components as tc - from fire import testutils - from fire import trace --import mock -+ -+try: -+ import mock # python 2.x -+except ModuleNotFoundError: -+ from unittest import mock # python 3.x - - import six - -Index: fire-0.5.0/fire/fire_import_test.py -=================================================================== ---- fire-0.5.0.orig/fire/fire_import_test.py -+++ fire-0.5.0/fire/fire_import_test.py -@@ -18,7 +18,10 @@ import sys - - import fire - from fire import testutils --import mock -+try: -+ from unittest import mock -+except ImportError: -+ import mock - - - class FireImportTest(testutils.BaseTestCase): -Index: fire-0.5.0/fire/fire_test.py -=================================================================== ---- fire-0.5.0.orig/fire/fire_test.py -+++ fire-0.5.0/fire/fire_test.py -@@ -25,7 +25,10 @@ import fire - from fire import test_components as tc - from fire import testutils - --import mock -+try: -+ import mock # python 2.x -+except ModuleNotFoundError: -+ from unittest import mock # python 3.x - import six - - -Index: fire-0.5.0/fire/interact_test.py -=================================================================== ---- fire-0.5.0.orig/fire/interact_test.py -+++ fire-0.5.0/fire/interact_test.py -@@ -21,7 +21,10 @@ from __future__ import print_function - from fire import interact - from fire import testutils - --import mock -+try: -+ from unittest import mock -+except ImportError: -+ import mock - - - try: -Index: fire-0.5.0/fire/testutils.py -=================================================================== ---- fire-0.5.0.orig/fire/testutils.py -+++ fire-0.5.0/fire/testutils.py -@@ -27,7 +27,10 @@ import unittest - from fire import core - from fire import trace - --import mock -+try: -+ import mock # python 2.x -+except ModuleNotFoundError: -+ from unittest import mock # python 3.x - import six - - diff --git a/python-fire.changes b/python-fire.changes index 2ec11e1..710ba2a 100644 --- a/python-fire.changes +++ b/python-fire.changes @@ -39,6 +39,8 @@ Thu Oct 31 14:31:28 UTC 2024 - pgajdos@suse.com * Lint improvements and type safety by @dbieber in #558 * ci: expand build matrix for major OS by @Borda in #490 * Replace Python 2 type hints with real type annotations by @dbieber in #559 +- Replace upstreamed patch: + - python-fire-no-mock.patch ------------------------------------------------------------------- Tue Feb 7 01:05:45 UTC 2023 - Steve Kowalik From bdc123da6b9f18735de40d54b415e4c7bc46dea5e70387039e4d38849a4c4d23 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 12 Nov 2024 00:32:43 +0000 Subject: [PATCH 3/3] - support-python-311.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-fire?expand=0&rev=27 --- python-fire.changes | 1 + support-python-311.patch | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 support-python-311.patch diff --git a/python-fire.changes b/python-fire.changes index 710ba2a..813641d 100644 --- a/python-fire.changes +++ b/python-fire.changes @@ -41,6 +41,7 @@ Thu Oct 31 14:31:28 UTC 2024 - pgajdos@suse.com * Replace Python 2 type hints with real type annotations by @dbieber in #559 - Replace upstreamed patch: - python-fire-no-mock.patch + - support-python-311.patch ------------------------------------------------------------------- Tue Feb 7 01:05:45 UTC 2023 - Steve Kowalik diff --git a/support-python-311.patch b/support-python-311.patch deleted file mode 100644 index e626fd2..0000000 --- a/support-python-311.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: fire-0.5.0/fire/test_components_py3.py -=================================================================== ---- fire-0.5.0.orig/fire/test_components_py3.py -+++ fire-0.5.0/fire/test_components_py3.py -@@ -57,8 +57,7 @@ def lru_cache_decorated(arg1): - - class WithAsyncio(object): - -- @asyncio.coroutine -- def double(self, count=0): -+ async def double(self, count=0): - return 2 * count - -