#1 Allow click 8
Closed 2 years ago by churchyard. Opened 2 years ago by churchyard.
rpms/ churchyard/python-fasjson-client click8  into  rawhide

file added
+39
@@ -0,0 +1,39 @@ 

+ From 341c948df1da24994f4901a571e764a0fd3e3ef3 Mon Sep 17 00:00:00 2001

+ From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

+ Date: Wed, 30 Jun 2021 02:01:49 +0200

+ Subject: [PATCH] Allow click 8

+ 

+ ---

+  pyproject.toml | 2 +-

+  setup.py       | 2 +-

+  2 files changed, 2 insertions(+), 2 deletions(-)

+ 

+ diff --git a/pyproject.toml b/pyproject.toml

+ index 6ba7f62..84c0fb0 100644

+ --- a/pyproject.toml

+ +++ b/pyproject.toml

+ @@ -38,7 +38,7 @@ bravado = "^10.6.0 || ^11"

+  requests = "^2.20.0"

+  requests-gssapi = "^1.2.1"

+  cryptography = {version = "^2.3 || ^3", optional = true}

+ -click = {version = "^6.7 || ^7", optional = true}

+ +click = {version = "^6.7 || ^7 || ^8", optional = true}

+  toml = "^0.10.0"

+  

+  [tool.poetry.dev-dependencies]

+ diff --git a/setup.py b/setup.py

+ index fff3402..1d363ee 100644

+ --- a/setup.py

+ +++ b/setup.py

+ @@ -18,7 +18,7 @@ install_requires = \

+   'toml>=0.10.0,<0.11.0']

+  

+  extras_require = \

+ -{'cli': ['cryptography>=2.3,<4', 'click>=6.7,<8']}

+ +{'cli': ['cryptography>=2.3,<4', 'click>=6.7,<9']}

+  

+  entry_points = \

+  {'console_scripts': ['fasjson-client = fasjson_client.cli:cli']}

+ -- 

+ 2.32.0

+ 

file modified
+12 -3
@@ -16,7 +16,7 @@ 

  

  Name:           python-%{pypi_name}

  Version:        0.1.2

- Release:        2%{?dist}

+ Release:        3%{?dist}

  Summary:        An OpenAPI client for FASJSON

  

  License:        LGPLv3+
@@ -24,6 +24,11 @@ 

  Source0:        %{pypi_source}

  BuildArch:      noarch

  

+ # Allow click 8

+ # https://github.com/fedora-infra/fasjson-client/pull/142

+ # Also patched the generated setup.py, because this package uses it

+ Patch1:         click8.patch

+ 

  # Split off fasjson-client into subpackage

  Obsoletes:      python3-fasjson-client < 0.1.1

  
@@ -31,7 +36,7 @@ 

  BuildRequires:  %{py3verdist setuptools}

  # runtime

  BuildRequires:  (%{py3verdist bravado} >= 10.6 with %{py3verdist bravado} < 12)

- BuildRequires:  (%{py3verdist click} >= 6.7 with %{py3verdist click} < 8)

+ BuildRequires:  (%{py3verdist click} >= 6.7 with %{py3verdist click} < 9)

  BuildRequires:  (%{py3verdist cryptography} >= 2.3 with %{py3verdist cryptography} < 4)

  BuildRequires:  (%{py3verdist gssapi} >= 1.5.1 with %{py3verdist gssapi} < 2)

  BuildRequires:  (%{py3verdist requests} >= 2.20.0 with %{py3verdist requests} < 3)
@@ -90,7 +95,7 @@ 

  A command line interface for the FASJSON API.

  

  %prep

- %autosetup -n %{pypi_name}-%{version}

+ %autosetup -p1 -n %{pypi_name}-%{version}

  

  %build

  %py3_build
@@ -115,6 +120,10 @@ 

  

  

  %changelog

+ * Wed Jun 30 2021 Miro Hrončok <mhroncok@redhat.com> - 0.1.2-3

+ - Allow click 8

+ - Fixes rhbz#1977509

+ 

  * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.1.2-2

  - Rebuilt for Python 3.10

  

no initial comment

rebased onto ca3fd34

2 years ago

@nphilipp Permission to merge this before the mass rebuild commit creates a conflict?

Pull-Request has been closed by churchyard

2 years ago
Metadata