- Switch build setup to agreed upon format to better accomodate SLE and

Factory and make it easier in the future to deal with Python interpreter changes (bsc#1221103) - Switch to wheel build - Update to version 3.37.13 * Support for New Dev License Type in Oracle Autonomous Database (on Dedicated Infrastructure) * Support for new optional parameters to create Autonomous Container Database * Support for Autoscaling in the Data Science Model Deployment service - From 3.37.12 * Support for server streaming events in the Generative AI Inference Service when `inference-request-is-stream` is set to true * Support for Whisper Models in creation of transcription job * Support for Delete Job API in transcription job * Support for updating host-insights * Support to receive insights from resources in child compartments for news reports * Support to update more parameters for news reports * Support to choose the day of the week the report is received for news reports - From 3.37.11 * Support for retrieving logs in Container Instance Service. * Support for queue source feature in Connector Hub Service. * Support for asynchronous data asset export in Data Catalog Service. * Support for the secret auto-generation in Vault Secret Management Service. * Support for new optional parameters in key commands to enable or modify automatic key rotation settings in Key Management Service. * Support for tagging for following commands in Database Management Service. * Support for multiple approvals (two approvals). * Support for forwarding Hypervisor logs. OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/oci-cli?expand=0&rev=118
2024-03-14 13:31:43 +00:00 · 2024-03-14 13:31:43 +00:00 · 10200c4895
commit 10200c4895
parent cf07ba1094
5 changed files with 132 additions and 74 deletions
--- a/oc_relax-python-depends.patch
+++ b/oc_relax-python-depends.patch
@ -1,6 +1,6 @@
-diff -Nru oci-cli-3.37.9.orig/requirements.txt oci-cli-3.37.9/requirements.txt
--- oci-cli-3.37.9.orig/requirements.txt	2024-02-13 11:20:04.000000000 +0100
-+++ oci-cli-3.37.9/requirements.txt	2024-02-16 14:28:54.514405130 +0100
+diff -Nru oci-cli-3.37.13.orig/requirements.txt oci-cli-3.37.13/requirements.txt
+--- oci-cli-3.37.13.orig/requirements.txt	2024-02-13 11:20:04.000000000 +0100
+++ oci-cli-3.37.13/requirements.txt	2024-02-16 14:28:54.514405130 +0100
@@ -2,47 +2,47 @@
 # (https://pip.pypa.io/en/stable/reference/pip_install/#requirements-file-format),
 # you may need to use the --extra-index-url option instead.
@ -12,18 +12,18 @@ diff -Nru oci-cli-3.37.9.orig/requirements.txt oci-cli-3.37.9/requirements.txt
 cffi>=1.9.1
 -click==8.0.4
 -coverage==4.5.2
-cryptography>=3.2.1,<42.0.0
+-cryptography>=3.2.1,<43.0.0
 -httpsig-cffi==15.0.0
 -Jinja2==3.0.3
 -jmespath==0.10.0
 -ndg-httpsclient==0.4.2
 -mock==2.0.0
-oci==2.121.1
+-oci==2.124.1
 -packaging==20.2
 -pluggy==0.13.0
 -py==1.11.0
 -pyasn1==0.2.3
-pyOpenSSL>=17.5.0,<24.0.0
+-pyOpenSSL>=17.5.0,<25.0.0
 -pycparser==2.20
 -pyparsing==2.2.0
 -pytest==4.6.10; python_version <= '3.9'
@ -85,19 +85,19 @@ diff -Nru oci-cli-3.37.9.orig/requirements.txt oci-cli-3.37.9/requirements.txt
 +setuptools>=59.6.0; python_version == '3.6'
 # this is required because of python 3.6 requests dependency version bound
 urllib3<=1.26.15
-diff -Nru oci-cli-3.37.9.orig/setup.py oci-cli-3.37.9/setup.py
--- oci-cli-3.37.9.orig/setup.py	2024-02-13 11:20:04.000000000 +0100
-+++ oci-cli-3.37.9/setup.py	2024-02-16 14:26:29.467531027 +0100
+diff -Nru oci-cli-3.37.13.orig/setup.py oci-cli-3.37.13/setup.py
+--- oci-cli-3.37.13.orig/setup.py	2024-02-13 11:20:04.000000000 +0100
+++ oci-cli-3.37.13/setup.py	2024-02-16 14:26:29.467531027 +0100
@@ -30,23 +30,23 @@
     readme = f.read()
 
 requires = [
-    'oci==2.121.1',
-+    'oci>=2.121.1',
+-    'oci==2.124.1',
+    'oci>=2.124.1',
     'arrow>=1.0.0',
     'certifi',
 -    'click==8.0.4',
-    'cryptography>=3.2.1,<42.0.0',
+-    'cryptography>=3.2.1,<43.0.0',
 -    'jmespath==0.10.0',
 -    'python-dateutil>=2.5.3,<3.0.0',
 +    'click>=8.0.4',
@ -107,7 +107,7 @@ diff -Nru oci-cli-3.37.9.orig/setup.py oci-cli-3.37.9/setup.py
     'pytz>=2016.10',
     'six>=1.15.0',
 -    'terminaltables==3.1.10',
-    'pyOpenSSL>=17.5.0,<24.0.0',
+-    'pyOpenSSL>=17.5.0,<25.0.0',
 -    'PyYAML>=5.4,<=6.0.1',
 -    'prompt-toolkit==3.0.29'
 +    'terminaltables>=3.1.10',
--- a/oci-cli-3.37.13.tar.gz
+++ b/oci-cli-3.37.13.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:172597a959b170dc542eac64db3c38b7249ee88a58a59f5982e197c2b76ca04a
+size 5232757
--- a/oci-cli-3.37.9.tar.gz
+++ b/oci-cli-3.37.9.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:15e1cb3c6829972be9a32be775a7a11213730de3d4b88e69e8863810817c2c86
-size 5198369
--- a/oci-cli.changes
+++ b/oci-cli.changes
@ -1,3 +1,51 @@
+-------------------------------------------------------------------
+Thu Mar 14 12:45:16 UTC 2024 - Robert Schweikert <rjschwei@suse.com>
+
+- Switch build setup to agreed upon format to better accomodate SLE and
+  Factory and make it easier in the future to deal with Python interpreter
+  changes (bsc#1221103)
+- Switch to wheel build
+- Update to version 3.37.13
+  * Support for New Dev License Type in Oracle Autonomous Database
+    (on Dedicated Infrastructure)
+  * Support for new optional parameters to create Autonomous Container Database
+  * Support for Autoscaling in the Data Science Model Deployment service
+- From 3.37.12
+  * Support for server streaming events in the Generative AI Inference
+    Service when `inference-request-is-stream` is set to true
+  * Support for Whisper Models in creation of transcription job
+  * Support for Delete Job API in transcription job
+  * Support for updating host-insights
+  * Support to receive insights from resources in child compartments for
+    news reports
+  * Support to update more parameters for news reports
+  * Support to choose the day of the week the report is received for news
+    reports
+- From 3.37.11
+  * Support for retrieving logs in Container Instance Service.
+  * Support for queue source feature in Connector Hub Service.
+  * Support for asynchronous data asset export in Data Catalog Service.
+  * Support for the secret auto-generation in Vault Secret Management Service.
+  * Support for new optional parameters in key commands to enable or modify
+    automatic key rotation settings in Key Management Service.
+  * Support for tagging for following commands in Database Management Service.
+  * Support for multiple approvals (two approvals).
+  * Support for forwarding Hypervisor logs.
+  * Support for Assignment health check.
+  * Support for the cluster placement group feature in Cloud Exadata
+    Infrastructure.
+  * Support for Create Autonomous Dataguard Association.
+  * Support for specifying dialog version when creating skills.
+  * Support for bulk creation of skill entities.
+  * Support for training skill query entities.
+  * Support for cascading delete of skill custom entities.
+- From 3.37.10
+  * Support for Bring Your Own Container Jobs (v2) in the Data Science service
+  * Support for Secure Desktops Service
+  * Support for new optional parameter in Language Service
+  * Support for new optional parameter
+  * Support for new commands
+
 -------------------------------------------------------------------
 Mon Feb 26 12:34:20 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

--- a/oci-cli.spec
+++ b/oci-cli.spec
@ -27,8 +27,16 @@
 %define psuffix %{nil}
 %bcond_with test
 %endif
+
+%if 0%{?suse_version} >= 1600
+%define pythons %{primary_python}
+%else
+%define pythons python311
+%endif
+%global _sitelibdir %{%{pythons}_sitelib}
+
 Name:           oci-cli%{psuffix}
-Version:        3.37.9
+Version:        3.37.13
 Release:        0
 Summary:        Oracle Cloud Infrastructure CLI
 License:        Apache-2.0
@ -36,62 +44,64 @@ Group:          Development/Languages/Python
 URL:            https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/cli.htm
 Source:         https://github.com/oracle/oci-cli/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Patch0:         oc_relax-python-depends.patch
+BuildRequires:  %{pythons}-PyJWT
+BuildRequires:  %{pythons}-PyYAML >= 5.4.1
+BuildRequires:  %{pythons}-arrow >= 1.0.0
+BuildRequires:  %{pythons}-certifi
+BuildRequires:  %{pythons}-click >= 8.0.4
+BuildRequires:  %{pythons}-cryptography >= 3.2.1
+BuildRequires:  %{pythons}-devel
+BuildRequires:  %{pythons}-jmespath >= 0.10.0
+BuildRequires:  %{pythons}-oci-sdk >= 2.121.1
+BuildRequires:  %{pythons}-pip
+BuildRequires:  %{pythons}-pyOpenSSL >= 22.1.0
+BuildRequires:  %{pythons}-python-dateutil >= 2.5.3
+BuildRequires:  %{pythons}-pytz >= 2016.10
+BuildRequires:  %{pythons}-setuptools
+BuildRequires:  %{pythons}-six >= 1.15.0
+BuildRequires:  %{pythons}-terminaltables >= 3.1.10
+BuildRequires:  %{pythons}-wheel
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-BuildRequires:  python3-PyJWT
-BuildRequires:  python3-PyYAML >= 5.4.1
-BuildRequires:  python3-arrow >= 1.0.0
-BuildRequires:  python3-certifi
-BuildRequires:  python3-click >= 8.0.4
-BuildRequires:  python3-cryptography >= 3.2.1
-BuildRequires:  python3-devel
-BuildRequires:  python3-jmespath >= 0.10.0
-BuildRequires:  python3-oci-sdk >= 2.121.1
-BuildRequires:  python3-pyOpenSSL >= 22.1.0
-BuildRequires:  python3-python-dateutil >= 2.5.3
-BuildRequires:  python3-pytz >= 2016.10
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-six >= 1.15.0
-BuildRequires:  python3-terminaltables >= 3.1.10
 %if %{with test}
-BuildRequires:  python3-Jinja2 >= 2.11.3
-BuildRequires:  python3-Sphinx >= 1.6.4
-BuildRequires:  python3-appdirs >= 1.4.3
-BuildRequires:  python3-cffi >= 1.9.1
-BuildRequires:  python3-coverage >= 4.5.2
-BuildRequires:  python3-ndg-httpsclient >= 0.4.2
-BuildRequires:  python3-packaging >= 20.2
-BuildRequires:  python3-pluggy >= 0.13.0
-BuildRequires:  python3-py >= 1.11.0
-BuildRequires:  python3-pyasn1 >= 0.2.3
-BuildRequires:  python3-pycparser >= 2.20
-BuildRequires:  python3-pyparsing >= 2.2.0
-BuildRequires:  python3-pytest-cov >= 2.5.1
-BuildRequires:  python3-pytest-forked >= 1.0.2
-BuildRequires:  python3-pytest-xdist >= 1.22.2
-BuildRequires:  python3-requests >= 2.21.0
-BuildRequires:  python3-sphinx_rtd_theme >= 0.4.3
-BuildRequires:  python3-tox >= 3.23.0
-BuildRequires:  python3-vcrpy >= 4.2.1
-BuildRequires:  python3-virtualenv >= 16.7.10
-BuildRequires:  (python3-vcrpy >= 1.13.0 if python-base <= 3.9)
-BuildRequires:  (python3-vcrpy >= 4.2.1 if python-base >= 3.10)
-BuildRequires:  (python3-vcrpy >= 4.6.10 if python-base <= 3.9)
-BuildRequires:  (python3-vcrpy >= 7.1.2 if python-base >= 3.10)
+BuildRequires:  %{pythons}-Jinja2 >= 2.11.3
+BuildRequires:  %{pythons}-Sphinx >= 1.6.4
+BuildRequires:  %{pythons}-appdirs >= 1.4.3
+BuildRequires:  %{pythons}-cffi >= 1.9.1
+BuildRequires:  %{pythons}-coverage >= 4.5.2
+BuildRequires:  %{pythons}-ndg-httpsclient >= 0.4.2
+BuildRequires:  %{pythons}-packaging >= 20.2
+BuildRequires:  %{pythons}-pluggy >= 0.13.0
+BuildRequires:  %{pythons}-py >= 1.11.0
+BuildRequires:  %{pythons}-pyasn1 >= 0.2.3
+BuildRequires:  %{pythons}-pycparser >= 2.20
+BuildRequires:  %{pythons}-pyparsing >= 2.2.0
+BuildRequires:  %{pythons}-pytest-cov >= 2.5.1
+BuildRequires:  %{pythons}-pytest-forked >= 1.0.2
+BuildRequires:  %{pythons}-pytest-xdist >= 1.22.2
+BuildRequires:  %{pythons}-requests >= 2.21.0
+BuildRequires:  %{pythons}-sphinx_rtd_theme >= 0.4.3
+BuildRequires:  %{pythons}-tox >= 3.23.0
+BuildRequires:  %{pythons}-vcrpy >= 4.2.1
+BuildRequires:  %{pythons}-virtualenv >= 16.7.10
+BuildRequires:  (%{pythons}-vcrpy >= 1.13.0 if python-base <= 3.9)
+BuildRequires:  (%{pythons}-vcrpy >= 4.2.1 if python-base >= 3.10)
+BuildRequires:  (%{pythons}-vcrpy >= 4.6.10 if python-base <= 3.9)
+BuildRequires:  (%{pythons}-vcrpy >= 7.1.2 if python-base >= 3.10)
 %endif
-Requires:       python3-PyYAML >= 5.4.1
-Requires:       python3-arrow >= 1.0.0
-Requires:       python3-certifi
-Requires:       python3-click >= 8.0.4
-Requires:       python3-cryptography >= 3.2.1
-Requires:       python3-jmespath >= 0.10.0
-Requires:       python3-oci-sdk >= 2.121.1
-Requires:       python3-prompt_toolkit >= 3.0.29
-Requires:       python3-pyOpenSSL >= 22.1.0
-Requires:       python3-python-dateutil >= 2.5.3
-Requires:       python3-pytz >= 2016.10
-Requires:       python3-six >= 1.15.0
-Requires:       python3-terminaltables >= 3.1.10
+Requires:       %{pythons}-PyYAML >= 5.4.1
+Requires:       %{pythons}-arrow >= 1.0.0
+Requires:       %{pythons}-certifi
+Requires:       %{pythons}-click >= 8.0.4
+Requires:       %{pythons}-cryptography >= 3.2.1
+Requires:       %{pythons}-jmespath >= 0.10.0
+Requires:       %{pythons}-oci-sdk >= 2.121.1
+Requires:       %{pythons}-prompt_toolkit >= 3.0.29
+Requires:       %{pythons}-pyOpenSSL >= 22.1.0
+Requires:       %{pythons}-python-dateutil >= 2.5.3
+Requires:       %{pythons}-pytz >= 2016.10
+Requires:       %{pythons}-six >= 1.15.0
+Requires:       %{pythons}-terminaltables >= 3.1.10

 BuildArch:      noarch

@ -110,24 +120,24 @@ find . -name "*.py" -exec sed -i 's/from oci\._vendor //' \{\} +
 find . -name "*.py" -exec sed -i 's/oci\._vendor\.//' \{\} +

 %build
-%python3_build
+%pyproject_wheel

 %if %{with test}
 %check
 export PYTHONDONTWRITEBYTECODE=1
-export PYTHONPATH=%{buildroot}%{python3_sitelib}
+export PYTHONPATH=%{buildroot}%{_sitelibdir}
 py.test -s tests/unit
 %endif

 %install
-%python3_install
-%fdupes %{buildroot}%{python3_sitelib}
+%pyproject_install
+%fdupes %{buildroot}%{_sitelibdir}

 %files
 %doc CHANGELOG.rst README.rst
 %license LICENSE.txt
 %{_bindir}/oci
 %{_bindir}/create_backup_from_onprem
-%{python3_sitelib}/*
+%{_sitelibdir}/*

 %changelog