diff --git a/.gitignore b/.gitignore index 1341cf4..23b9ae7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /azure-devtools-1.0.0.tar.gz +/azure-sdk-for-python-a88809f86787492ddc99c4b3ea5de36c99f14b4f.tar.gz diff --git a/python-azure-devtools-requirements-fix.patch b/python-azure-devtools-requirements-fix.patch new file mode 100644 index 0000000..fe1dce2 --- /dev/null +++ b/python-azure-devtools-requirements-fix.patch @@ -0,0 +1,12 @@ +diff -up ./tools/azure-devtools/setup.py.orig ./tools/azure-devtools/setup.py +--- ./tools/azure-devtools/setup.py.orig 2021-07-22 10:18:01.048710671 -0500 ++++ ./tools/azure-devtools/setup.py 2021-07-22 10:18:12.486637887 -0500 +@@ -23,7 +23,7 @@ CLASSIFIERS = [ + "License :: OSI Approved :: MIT License", + ] + +-DEPENDENCIES = ["ConfigArgParse>=0.12.0", "six>=1.10.0", "vcrpy~=3.0.0"] ++DEPENDENCIES = ["ConfigArgParse>=0.12.0", "six>=1.10.0", "vcrpy>=3.0.0"] + + with io.open("README.rst", "r", encoding="utf-8") as f: + README = f.read() diff --git a/python-azure-devtools.spec b/python-azure-devtools.spec index 8670fad..e0043e6 100644 --- a/python-azure-devtools.spec +++ b/python-azure-devtools.spec @@ -1,89 +1,72 @@ -%{?python_enable_dependency_generator} - -%global srcname azure-devtools -%global common_description This package contains tools to aid in developing Python-based Azure code. +# The last versioned release of the devtools code is 1.2.1, but upstream +# continues to update it without bumping the version. šŸ˜ž +%global srcname azure-devtools +%global forgeurl https://github.com/Azure/azure-sdk-for-python/ +%global commit a88809f86787492ddc99c4b3ea5de36c99f14b4f +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global distprefix %{nil} +%global short_version 1.2.1 +%forgemeta Name: python-%{srcname} -Version: 1.0.0 -Release: 10%{?dist} -Summary: Devtools for Azure SDK and CLI for Python +Version: %{short_version}~git.1.%{shortcommit} +Release: 1%{?dist} +Summary: Microsoft Azure Development Tools for SDK +License: MIT and ASL 2.0 +URL: %forgeurl +Source0: %forgesource +# Asked upstream to update the vcrpy requirement. PR in progress. +# https://github.com/Azure/azure-sdk-for-python/pull/20032 +Patch0: python-azure-devtools-requirements-fix.patch -License: MIT -URL: https://github.com/Azure/azure-python-devtools -Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -# Needed for tests -BuildRequires: python3-configargparse -BuildRequires: python3-six -BuildRequires: python3-vcrpy BuildArch: noarch -%description -%{common_description} +Obsoletes: python-azure-sdk < 5.0.1 + +BuildRequires: python3-devel +BuildRequires: python3-pip +BuildRequires: python3-setuptools +BuildRequires: python3-wheel +BuildRequires: pyproject-rpm-macros + + +%global _description %{expand: +Development tools for Python-based Azure tools +This package contains tools to aid in developing Python-based Azure code.} + +%description %{_description} %package -n python3-%{srcname} Summary: %{summary} -%{?python_provide:%python_provide python3-%{srcname}} -%description -n python3-%{srcname} -%{common_description} +%description -n python3-%{srcname} %{_description} %prep -%autosetup -n azure-python-devtools-%{version} +%forgesetup +%patch0 -p0 %build -%py3_build +pushd tools/%{srcname} + %pyproject_wheel +popd %install -%py3_install +%pyproject_install +%pyproject_save_files azure_devtools + +# Some provided executables are only used internally in Azure SDK's CI. +rm -f %{buildroot}%{_bindir}/{perfstress,systemperf} -%check -%{__python3} -m unittest discover -s src/ - - -%files -n python3-%{srcname} -%doc README.rst doc/ -%license LICENSE -%{python3_sitelib}/azure_devtools/ -%{python3_sitelib}/azure_devtools-*.egg-info/ +%files -n python3-%{srcname} -f %{pyproject_files} +%doc tools/%{srcname}/README.rst +%license tools/%{srcname}/LICENSE %changelog -* Tue May 26 2020 Miro Hrončok - 1.0.0-10 -- Rebuilt for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.0.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 1.0.0-8 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 1.0.0-7 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.0.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Apr 19 2019 Mohamed El Morabity - 1.0.0-5 -- Enable Python generators -- Enable tests -- Spec cleanup - -* Sat Feb 02 2019 Fedora Release Engineering - 1.0.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Nov 21 2018 Mohamed El Morabity - 1.0.0-3 -- Fix dependency on python-vcrpy for Fedora <= 27 - -* Tue Nov 20 2018 Mohamed El Morabity - 1.0.0-2 -- Don't glob everything under the Python sitelib directory - -* Sat Nov 03 2018 Mohamed El Morabity - 1.0.0-1 -- Initial RPM release +* Tue Jun 01 2021 Major Hayden - 1.2.1~git.1.a88809f +- Unretired package. diff --git a/sources b/sources index 0625b2b..bad57a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (azure-devtools-1.0.0.tar.gz) = aed2687f439d76faf88312b65ad8d8ba8c9c248267102dafff3052e97ff4bf9c0d2cfb9f96ce63885aac54f03ec1aa17c856f1f71d4d14e85a7d8302931e9baf +SHA512 (azure-sdk-for-python-a88809f86787492ddc99c4b3ea5de36c99f14b4f.tar.gz) = 53cb72b19555f616020784a358dd8637ed08bb123aafab9c07185865de33174050096e74ca260a38d9dadffb9df01403f1acb71baf9bfbb070c910d00ab7532f