From 22df9d72060ca414b40a672640c43427a46595d4ab30108d144410b2dc26f578 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Mon, 15 Apr 2019 14:20:59 +0000 Subject: [PATCH] Accepting request 694313 from home:glaubitz:branches:devel:languages:python:azure3 - Update Python Azure SDK to latest version OBS-URL: https://build.opensuse.org/request/show/694313 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:azure/python-azure-mgmt-network?expand=0&rev=6 --- amn_drop-compatible-releases-operator.patch | 24 ++++++++++----------- amn_drop-extras-require.patch | 11 ++++++++++ azure-mgmt-network-2.1.0.zip | 3 --- azure-mgmt-network-2.6.0rc1.zip | 3 +++ python-azure-mgmt-network.changes | 20 +++++++++++++++++ python-azure-mgmt-network.spec | 19 +++++++++------- 6 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 amn_drop-extras-require.patch delete mode 100644 azure-mgmt-network-2.1.0.zip create mode 100644 azure-mgmt-network-2.6.0rc1.zip diff --git a/amn_drop-compatible-releases-operator.patch b/amn_drop-compatible-releases-operator.patch index aab1235..ec25165 100644 --- a/amn_drop-compatible-releases-operator.patch +++ b/amn_drop-compatible-releases-operator.patch @@ -1,12 +1,12 @@ -diff -Nru azure-mgmt-network-2.1.0.orig/setup.py azure-mgmt-network-2.1.0/setup.py ---- azure-mgmt-network-2.1.0.orig/setup.py 2018-08-28 20:44:06.000000000 +0200 -+++ azure-mgmt-network-2.1.0/setup.py 2018-09-04 14:02:22.948321093 +0200 -@@ -80,7 +80,7 @@ - install_requires=[ - 'msrest>=0.5.0', - 'msrestazure>=0.4.32,<2.0.0', -- 'azure-common~=1.1,>=1.1.9', -+ 'azure-common>=1.1.9,<2.0.0', - ], - cmdclass=cmdclass - ) +diff -Nru azure-mgmt-network-2.6.0rc1.orig/setup.py azure-mgmt-network-2.6.0rc1/setup.py +--- azure-mgmt-network-2.6.0rc1.orig/setup.py 2019-02-15 16:55:42.000000000 +0100 ++++ azure-mgmt-network-2.6.0rc1/setup.py 2019-03-28 12:55:29.228799159 +0100 +@@ -79,7 +79,7 @@ + install_requires=[ + 'msrest>=0.5.0', + 'msrestazure>=0.4.32,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1', + ], + extras_require={ + ":python_version<'3.0'": ['azure-mgmt-nspkg'], diff --git a/amn_drop-extras-require.patch b/amn_drop-extras-require.patch new file mode 100644 index 0000000..dc200a5 --- /dev/null +++ b/amn_drop-extras-require.patch @@ -0,0 +1,11 @@ +diff -Nru azure-mgmt-network-2.6.0rc1.orig/setup.py azure-mgmt-network-2.6.0rc1/setup.py +--- azure-mgmt-network-2.6.0rc1.orig/setup.py 2019-03-28 12:57:51.558122309 +0100 ++++ azure-mgmt-network-2.6.0rc1/setup.py 2019-03-28 12:58:00.706207341 +0100 +@@ -81,7 +81,4 @@ + 'msrestazure>=0.4.32,<2.0.0', + 'azure-common>=1.1', + ], +- extras_require={ +- ":python_version<'3.0'": ['azure-mgmt-nspkg'], +- } + ) diff --git a/azure-mgmt-network-2.1.0.zip b/azure-mgmt-network-2.1.0.zip deleted file mode 100644 index cf0ca02..0000000 --- a/azure-mgmt-network-2.1.0.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fba2d8e0d7d036b50f271eff3a28fe78f550147d0dd972dc3ccbd46009ede867 -size 7016420 diff --git a/azure-mgmt-network-2.6.0rc1.zip b/azure-mgmt-network-2.6.0rc1.zip new file mode 100644 index 0000000..7ee399c --- /dev/null +++ b/azure-mgmt-network-2.6.0rc1.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95a2a409733fd831f813a870d509cbe7df1287dc242ed5faa024ed5934374963 +size 10579600 diff --git a/python-azure-mgmt-network.changes b/python-azure-mgmt-network.changes index 628449d..95f0028 100644 --- a/python-azure-mgmt-network.changes +++ b/python-azure-mgmt-network.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Apr 12 13:07:40 UTC 2019 - John Paul Adrian Glaubitz + +- New upstream release + + Version 2.6.0rc1 + + For detailed information about changes see the + HISTORY.txt file provided with this package +- Add patch to drop extras_require field from setup.py, + required for SLES12 as the setuptools version is too old + + amn_drop-extras-require.patch +- Bump minimum version for namespace packages + to 3.0.0 in BuildRequires and Requires +- Remove python-devel package from BuildRequires +- Refresh patches for new version + + amn_drop-compatible-releases-operator.patch +- Run fdupes to hardlink duplicate files + + Add fdupes to BuildRequires + + Add %fdupes invocation to %install +- Update BuildRequires and Requires from setup.py + ------------------------------------------------------------------- Tue Sep 4 12:32:32 UTC 2018 - John Paul Adrian Glaubitz diff --git a/python-azure-mgmt-network.spec b/python-azure-mgmt-network.spec index c4accce..5b247cd 100644 --- a/python-azure-mgmt-network.spec +++ b/python-azure-mgmt-network.spec @@ -1,7 +1,7 @@ # # spec file for package python-azure-mgmt-network # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-azure-mgmt-network -Version: 2.1.0 +Version: 2.6.0rc1 Release: 0 Summary: Microsoft Azure Network Management Client Library License: MIT @@ -27,16 +27,17 @@ Url: https://github.com/Azure/azure-sdk-for-python Source: https://files.pythonhosted.org/packages/source/a/azure-mgmt-network/azure-mgmt-network-%{version}.zip Source1: LICENSE.txt Patch1: amn_drop-compatible-releases-operator.patch -BuildRequires: %{python_module azure-mgmt-nspkg} -BuildRequires: %{python_module azure-nspkg} -BuildRequires: %{python_module devel} +Patch2: amn_drop-extras-require.patch +BuildRequires: %{python_module azure-mgmt-nspkg >= 3.0.0} +BuildRequires: %{python_module azure-nspkg >= 3.0.0} BuildRequires: %{python_module setuptools} +BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: unzip Requires: python-azure-common < 2.0.0 -Requires: python-azure-common >= 1.1.9 -Requires: python-azure-mgmt-nspkg -Requires: python-azure-nspkg +Requires: python-azure-common >= 1.1 +Requires: python-azure-mgmt-nspkg >= 3.0.0 +Requires: python-azure-nspkg >= 3.0.0 Requires: python-msrest >= 0.5.0 Requires: python-msrestazure < 2.0.0 Requires: python-msrestazure >= 0.4.32 @@ -57,6 +58,7 @@ This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7. %prep %setup -q -n azure-mgmt-network-%{version} %patch1 -p1 +%patch2 -p1 %build install -m 644 %{SOURCE1} %{_builddir}/azure-mgmt-network-%{version} @@ -64,6 +66,7 @@ install -m 644 %{SOURCE1} %{_builddir}/azure-mgmt-network-%{version} %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %{python_expand # delete common files rm -rf %{buildroot}%{$python_sitelib}/azure/mgmt/__init__.* rm -rf %{buildroot}%{$python_sitelib}/azure/mgmt/__pycache__