From e505499637952d4c369f090c14df58d0ea53681ee7524aeb2d3375abc410c3a7 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Thu, 25 Jul 2024 12:18:39 +0200 Subject: [PATCH] - Update to version 3.44.3 * Support for calling Oracle Cloud Infrastructure services in the me-abudhabi-2 region - Refresh patches for new version * oc_relax-python-depends.patch - Update BuildRequires and Requires from setup.py --- oc_relax-python-depends.patch | 57 +++++++++++++++-------------------- oci-cli-3.44.2.tar.gz | 3 -- oci-cli-3.44.3.tar.gz | 3 ++ oci-cli.changes | 9 ++++++ oci-cli.spec | 6 ++-- 5 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 oci-cli-3.44.2.tar.gz create mode 100644 oci-cli-3.44.3.tar.gz diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch index cac5365..9293ae5 100644 --- a/oc_relax-python-depends.patch +++ b/oc_relax-python-depends.patch @@ -1,7 +1,7 @@ -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 @@ +diff -Nru oci-cli-3.44.3.orig/requirements.txt oci-cli-3.44.3/requirements.txt +--- oci-cli-3.44.3.orig/requirements.txt 2024-07-16 09:07:19.000000000 +0200 ++++ oci-cli-3.44.3/requirements.txt 2024-07-25 12:16:02.559485192 +0200 +@@ -2,45 +2,45 @@ # (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.2.orig/requirements.txt oci-cli-3.44.2/requirements.txt -jmespath==0.10.0 -ndg-httpsclient==0.4.2 -mock==2.0.0 --oci==2.129.2 +-oci==2.129.3 -packaging==20.2 -pluggy==0.13.0 -py==1.11.0 @@ -26,10 +26,6 @@ diff -Nru oci-cli-3.44.2.orig/requirements.txt oci-cli-3.44.2/requirements.txt -pyOpenSSL>=17.5.0,<25.0.0 -pycparser==2.20 -pyparsing==2.2.0 --pytest==4.6.10; python_version <= '3.9' --pytest==7.1.2; python_version >= '3.10' --pytest-cov==2.5.1 --python-dateutil>=2.5.3,<3.0.0 +click>=8.0.4 +coverage>=4.5.2 +cryptography>=3.2.1 @@ -38,7 +34,7 @@ diff -Nru oci-cli-3.44.2.orig/requirements.txt oci-cli-3.44.2/requirements.txt +jmespath>=0.10.0 +ndg-httpsclient>=0.4.2 +mock>=2.0.0 -+oci>=2.129.2 ++oci>=2.129.3 +packaging>=20.2 +pluggy>=0.13.0 +py>=1.11.0 @@ -46,64 +42,59 @@ diff -Nru oci-cli-3.44.2.orig/requirements.txt oci-cli-3.44.2/requirements.txt +pyOpenSSL>=17.5.0 +pycparser>=2.20 +pyparsing>=2.2.0 -+pytest>=4.6.10; python_version <= '3.9' + pytest==4.6.10; python_version <= '3.9' +-pytest==7.1.2; python_version >= '3.10' +-pytest-cov==2.5.1 +-python-dateutil>=2.5.3,<3.0.0 +pytest>=7.1.2; python_version >= '3.10' +pytest-cov>=2.5.1 +python-dateutil>=2.5.3 pytz>=2016.10 --requests==2.21.0; python_version == '3.6' + requests==2.21.0; python_version == '3.6' -requests==2.31.0; python_version > '3.6' -+requests>=2.21.0; python_version == '3.6' +requests>=2.31.0; python_version > '3.6' six>=1.15.0 -sphinx==3.3.0 -sphinx-rtd-theme==0.4.3 -terminaltables==3.1.10 -tox==3.23.0 --vcrpy==1.13.0; python_version <= '3.9' ++sphinx>=3.3.0 ++sphinx-rtd-theme>=0.4.3 ++terminaltables>=3.1.10 ++tox>=3.23.0 + vcrpy==1.13.0; python_version <= '3.9' -vcrpy==4.2.1; python_version >= '3.10' -virtualenv==20.13.0 -pytest-xdist==1.22.2 -pytest-forked==1.0.2 -PyYAML>=5.4,<=6.0.1 -docutils==0.15.2 --prompt-toolkit==3.0.29; python_version == '3.6' -+sphinx>=3.3.0 -+sphinx-rtd-theme>=0.4.3 -+terminaltables>=3.1.10 -+tox>=3.23.0 -+vcrpy>=1.13.0; python_version <= '3.9' +vcrpy>=4.2.1; python_version >= '3.10' +virtualenv>=20.13.0 +pytest-xdist>=1.22.2 +pytest-forked>=1.0.2 +PyYAML>=5.4 +docutils>=0.15.2 -+prompt-toolkit>=3.0.29; python_version == '3.6' + prompt-toolkit==3.0.29; python_version == '3.6' prompt-toolkit>=3.0.38,<=3.0.43; python_version > '3.6' setuptools>65.5.1; python_version > '3.6' --setuptools==59.6.0; python_version == '3.6' -+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.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 +diff -Nru oci-cli-3.44.3.orig/setup.py oci-cli-3.44.3/setup.py +--- oci-cli-3.44.3.orig/setup.py 2024-07-16 09:07:19.000000000 +0200 ++++ oci-cli-3.44.3/setup.py 2024-07-25 12:12:13.974765186 +0200 @@ -30,18 +30,18 @@ readme = f.read() requires = [ -- 'oci==2.129.2', -+ 'oci>=2.129.2', +- 'oci==2.129.3', ++ 'oci>=2.129.3', 'arrow>=1.0.0', 'certifi', - 'click==8.0.4', - 'cryptography>=3.2.1,<43.0.0', -- 'jmespath==0.10.0', -- 'python-dateutil>=2.5.3,<3.0.0', + 'click>=8.0.4', + 'cryptography>=3.2.1', -+ 'jmespath>=0.10.0', + 'jmespath==0.10.0', +- 'python-dateutil>=2.5.3,<3.0.0', + 'python-dateutil>=2.5.3', 'pytz>=2016.10', 'six>=1.15.0', diff --git a/oci-cli-3.44.2.tar.gz b/oci-cli-3.44.2.tar.gz deleted file mode 100644 index c65af6e..0000000 --- a/oci-cli-3.44.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57cefc0bebb3b1872c4f17bad5242965803112a4e5d56d2eab62e00620d040fb -size 5359326 diff --git a/oci-cli-3.44.3.tar.gz b/oci-cli-3.44.3.tar.gz new file mode 100644 index 0000000..5728074 --- /dev/null +++ b/oci-cli-3.44.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e40429efd8128ac86262591b11852eef3def206521430fa27b2e695e6306a7d +size 5359270 diff --git a/oci-cli.changes b/oci-cli.changes index fe1b453..992d8f3 100644 --- a/oci-cli.changes +++ b/oci-cli.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jul 25 10:16:22 UTC 2024 - John Paul Adrian Glaubitz + +- Update to version 3.44.3 + * Support for calling Oracle Cloud Infrastructure services in the me-abudhabi-2 region +- Refresh patches for new version + * oc_relax-python-depends.patch +- Update BuildRequires and Requires from setup.py + ------------------------------------------------------------------- Wed Jul 17 13:27:41 UTC 2024 - John Paul Adrian Glaubitz diff --git a/oci-cli.spec b/oci-cli.spec index 85bdc4e..5ca2f1c 100644 --- a/oci-cli.spec +++ b/oci-cli.spec @@ -36,7 +36,7 @@ %global _sitelibdir %{%{pythons}_sitelib} Name: oci-cli%{psuffix} -Version: 3.44.2 +Version: 3.44.3 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.2 +BuildRequires: %{pythons}-oci-sdk >= 2.129.3 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.2 +Requires: %{pythons}-oci-sdk >= 2.129.3 Requires: %{pythons}-prompt_toolkit >= 3.0.38 Requires: %{pythons}-pyOpenSSL >= 22.1.0 Requires: %{pythons}-python-dateutil >= 2.5.3