From 750e405eebd1a39bf3a50a9eca653c9c4ee390d539cd08082b7da2638009b93e Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 19 Jul 2024 08:08:43 +0000 Subject: [PATCH] - Update to version 3.44.2 * Database Service * Support for create new DB with OKV * ``oci db database create --key-store-id`` * Support for confirm key store details are correct * ``oci db key-store confirm-key-store-details-are-correct --key-store-id`` - Refresh patches for new version * oc_relax-python-depends.patch - Update BuildRequires and Requires from setup.py OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/oci-cli?expand=0&rev=136 --- oc_relax-python-depends.patch | 27 ++++++++++++--------------- oci-cli-3.44.1.tar.gz | 3 --- oci-cli-3.44.2.tar.gz | 3 +++ oci-cli.changes | 13 +++++++++++++ oci-cli.spec | 6 +++--- 5 files changed, 31 insertions(+), 21 deletions(-) delete mode 100644 oci-cli-3.44.1.tar.gz create mode 100644 oci-cli-3.44.2.tar.gz diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch index f43f326..cac5365 100644 --- a/oc_relax-python-depends.patch +++ b/oc_relax-python-depends.patch @@ -1,6 +1,6 @@ -diff -Nru oci-cli-3.44.1.orig/requirements.txt oci-cli-3.44.1/requirements.txt ---- oci-cli-3.44.1.orig/requirements.txt 2024-07-02 15:35:28.000000000 +0200 -+++ oci-cli-3.44.1/requirements.txt 2024-07-09 08:39:24.754099775 +0200 +diff -Nru oci-cli-3.44.2.orig/requirements.txt oci-cli-3.44.2/requirements.txt +--- oci-cli-3.44.2.orig/requirements.txt 2024-07-09 10:10:47.000000000 +0200 ++++ oci-cli-3.44.2/requirements.txt 2024-07-17 15:27:22.316700780 +0200 @@ -2,48 +2,48 @@ # (https://pip.pypa.io/en/stable/reference/pip_install/#requirements-file-format), # you may need to use the --extra-index-url option instead. @@ -18,7 +18,7 @@ diff -Nru oci-cli-3.44.1.orig/requirements.txt oci-cli-3.44.1/requirements.txt -jmespath==0.10.0 -ndg-httpsclient==0.4.2 -mock==2.0.0 --oci==2.129.1 +-oci==2.129.2 -packaging==20.2 -pluggy==0.13.0 -py==1.11.0 @@ -38,7 +38,7 @@ diff -Nru oci-cli-3.44.1.orig/requirements.txt oci-cli-3.44.1/requirements.txt +jmespath>=0.10.0 +ndg-httpsclient>=0.4.2 +mock>=2.0.0 -+oci>=2.129.1 ++oci>=2.129.2 +packaging>=20.2 +pluggy>=0.13.0 +py>=1.11.0 @@ -86,15 +86,15 @@ diff -Nru oci-cli-3.44.1.orig/requirements.txt oci-cli-3.44.1/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.44.1.orig/setup.py oci-cli-3.44.1/setup.py ---- oci-cli-3.44.1.orig/setup.py 2024-07-02 15:35:28.000000000 +0200 -+++ oci-cli-3.44.1/setup.py 2024-07-09 08:37:55.513854169 +0200 -@@ -30,20 +30,20 @@ +diff -Nru oci-cli-3.44.2.orig/setup.py oci-cli-3.44.2/setup.py +--- oci-cli-3.44.2.orig/setup.py 2024-07-09 10:10:47.000000000 +0200 ++++ oci-cli-3.44.2/setup.py 2024-07-17 15:24:28.993043047 +0200 +@@ -30,18 +30,18 @@ readme = f.read() requires = [ -- 'oci==2.129.1', -+ 'oci>=2.129.1', +- 'oci==2.129.2', ++ 'oci>=2.129.2', 'arrow>=1.0.0', 'certifi', - 'click==8.0.4', @@ -114,8 +114,5 @@ diff -Nru oci-cli-3.44.1.orig/setup.py oci-cli-3.44.1/setup.py + 'pyOpenSSL>=17.5.0', + 'PyYAML>=5.4', 'prompt-toolkit>=3.0.38,<=3.0.43; python_version > "3.6"', -- 'prompt-toolkit==3.0.29; python_version == "3.6"' -+ 'prompt-toolkit>=3.0.29; python_version == "3.6"' + 'prompt-toolkit==3.0.29; python_version == "3.6"' ] - - extras = { diff --git a/oci-cli-3.44.1.tar.gz b/oci-cli-3.44.1.tar.gz deleted file mode 100644 index b358d64..0000000 --- a/oci-cli-3.44.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3861a310eab3ba022c04a6d8eaa755ad1147f0c6e5e920097de9d181ff733f09 -size 5358821 diff --git a/oci-cli-3.44.2.tar.gz b/oci-cli-3.44.2.tar.gz new file mode 100644 index 0000000..c65af6e --- /dev/null +++ b/oci-cli-3.44.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57cefc0bebb3b1872c4f17bad5242965803112a4e5d56d2eab62e00620d040fb +size 5359326 diff --git a/oci-cli.changes b/oci-cli.changes index 9bcdfb0..fe1b453 100644 --- a/oci-cli.changes +++ b/oci-cli.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jul 17 13:27:41 UTC 2024 - John Paul Adrian Glaubitz + +- Update to version 3.44.2 + * Database Service + * Support for create new DB with OKV + * ``oci db database create --key-store-id`` + * Support for confirm key store details are correct + * ``oci db key-store confirm-key-store-details-are-correct --key-store-id`` +- Refresh patches for new version + * oc_relax-python-depends.patch +- Update BuildRequires and Requires from setup.py + ------------------------------------------------------------------- Tue Jul 9 06:39:46 UTC 2024 - John Paul Adrian Glaubitz diff --git a/oci-cli.spec b/oci-cli.spec index 8676cc5..85bdc4e 100644 --- a/oci-cli.spec +++ b/oci-cli.spec @@ -36,7 +36,7 @@ %global _sitelibdir %{%{pythons}_sitelib} Name: oci-cli%{psuffix} -Version: 3.44.1 +Version: 3.44.2 Release: 0 Summary: Oracle Cloud Infrastructure CLI License: Apache-2.0 @@ -52,7 +52,7 @@ 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.129.1 +BuildRequires: %{pythons}-oci-sdk >= 2.129.2 BuildRequires: %{pythons}-pip BuildRequires: %{pythons}-pyOpenSSL >= 22.1.0 BuildRequires: %{pythons}-python-dateutil >= 2.5.3 @@ -95,7 +95,7 @@ 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.129.1 +Requires: %{pythons}-oci-sdk >= 2.129.2 Requires: %{pythons}-prompt_toolkit >= 3.0.38 Requires: %{pythons}-pyOpenSSL >= 22.1.0 Requires: %{pythons}-python-dateutil >= 2.5.3