From 1282c859fc529a341e60e960e694ada7bd7bfcc94eb7a7ca44c60ceaba914612 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 5 Jan 2024 20:04:00 +0000 Subject: [PATCH] Accepting request 1136516 from home:glaubitz:branches:Cloud:Tools - Update to version 3.37.1 * Support for carbon footprint reporting in the Usage Service * ``oci usage-api average-carbon-emission request`` * ``oci usage-api clean-energy-usage request`` * ``oci usage-api configuration request-usage-carbon-emission-config`` * ``oci usage-api usage-carbon-emission-summary request-usage-carbon-emissions`` * ``oci usage-api usage-carbon-emissions-query create`` * ``oci usage-api usage-carbon-emissions-query delete`` * ``oci usage-api usage-carbon-emissions-query get`` * ``oci usage-api usage-carbon-emissions-query list`` * ``oci usage-api usage-carbon-emissions-query update`` * Support for change compartment of configurations in the PostgreSQL service * ``oci psql configuration change-compartment`` * Support for Token Exchange in the IdentityDomains Service * ``oci identity-domains identity-propagation-trust`` * Support for resource locking in the Data Catalog Service * ``oci data-catalog catalog add`` * ``oci data-catalog catalog remove`` * ``oci data-catalog catalog-private-endpoint add`` * ``oci data-catalog catalog-private-endpoint remove`` * ``oci data-catalog metastore add`` * ``oci data-catalog metastore remove`` * Support for new optional parameter --dedicated-vm-host-id in the Core Service * ``oci compute instance update --dedicated-vm-host-id`` * Support for additional attributes for existing APIs in the Data Safe Service * ``oci data-safe sensitive-data-model list-discovery-analytics --is-common, --sensitive-type-id`` * ``oci data-safe sensitive-type list --is-common`` * Cloud Advisor Service * Support for non root compartment in list commands for resource action summary and history summary * ``oci optimizer resource-action-summary list -c `` OBS-URL: https://build.opensuse.org/request/show/1136516 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/oci-cli?expand=0&rev=108 --- oc_relax-python-depends.patch | 35 ++++++++++++----------- oci-cli-3.37.0.tar.gz | 3 -- oci-cli-3.37.1.tar.gz | 3 ++ oci-cli.changes | 53 +++++++++++++++++++++++++++++++++++ oci-cli.spec | 8 +++--- 5 files changed, 78 insertions(+), 24 deletions(-) delete mode 100644 oci-cli-3.37.0.tar.gz create mode 100644 oci-cli-3.37.1.tar.gz diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch index 972c443..223fa02 100644 --- a/oc_relax-python-depends.patch +++ b/oc_relax-python-depends.patch @@ -1,6 +1,6 @@ -diff -Nru oci-cli-3.37.0.orig/requirements.txt oci-cli-3.37.0/requirements.txt ---- oci-cli-3.37.0.orig/requirements.txt 2023-12-05 06:02:52.000000000 +0100 -+++ oci-cli-3.37.0/requirements.txt 2023-12-07 15:07:53.083631085 +0100 +diff -Nru oci-cli-3.37.1.orig/requirements.txt oci-cli-3.37.1/requirements.txt +--- oci-cli-3.37.1.orig/requirements.txt 2023-12-12 10:31:25.000000000 +0100 ++++ oci-cli-3.37.1/requirements.txt 2024-01-03 13:20:59.131874288 +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. @@ -18,11 +18,18 @@ diff -Nru oci-cli-3.37.0.orig/requirements.txt oci-cli-3.37.0/requirements.txt -jmespath==0.10.0 -ndg-httpsclient==0.4.2 -mock==2.0.0 --oci==2.117.0 +-oci==2.118.0 -packaging==20.2 -pluggy==0.13.0 -py==1.11.0 -pyasn1==0.2.3 +-pyOpenSSL>=17.5.0,<24.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 @@ -31,18 +38,12 @@ diff -Nru oci-cli-3.37.0.orig/requirements.txt oci-cli-3.37.0/requirements.txt +jmespath>=0.10.0 +ndg-httpsclient>=0.4.2 +mock>=2.0.0 -+oci>=2.117.0 ++oci>=2.118.0 +packaging>=20.2 +pluggy>=0.13.0 +py>=1.11.0 +pyasn1>=0.2.3 - pyOpenSSL>=17.5.0,<24.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 ++pyOpenSSL>=17.5.0 +pycparser>=2.20 +pyparsing>=2.2.0 +pytest>=4.6.10; python_version <= '3.9' @@ -84,15 +85,15 @@ diff -Nru oci-cli-3.37.0.orig/requirements.txt oci-cli-3.37.0/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.0.orig/setup.py oci-cli-3.37.0/setup.py ---- oci-cli-3.37.0.orig/setup.py 2023-12-05 06:02:52.000000000 +0100 -+++ oci-cli-3.37.0/setup.py 2023-12-07 15:07:20.340265628 +0100 +diff -Nru oci-cli-3.37.1.orig/setup.py oci-cli-3.37.1/setup.py +--- oci-cli-3.37.1.orig/setup.py 2023-12-12 10:31:25.000000000 +0100 ++++ oci-cli-3.37.1/setup.py 2024-01-03 13:20:00.861254190 +0100 @@ -30,23 +30,23 @@ readme = f.read() requires = [ -- 'oci==2.117.0', -+ 'oci>=2.117.0', +- 'oci==2.118.0', ++ 'oci>=2.118.0', 'arrow>=1.0.0', 'certifi', - 'click==8.0.4', diff --git a/oci-cli-3.37.0.tar.gz b/oci-cli-3.37.0.tar.gz deleted file mode 100644 index dfd5616..0000000 --- a/oci-cli-3.37.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5ef67413785d96de4dea41262d7d8e57f4fd0f617bb99e4479993a12c65a17b -size 5072489 diff --git a/oci-cli-3.37.1.tar.gz b/oci-cli-3.37.1.tar.gz new file mode 100644 index 0000000..cada4bb --- /dev/null +++ b/oci-cli-3.37.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfac69248a385f0329c2204ff57c984d1876533952066e00d94ab89253918470 +size 5084236 diff --git a/oci-cli.changes b/oci-cli.changes index 9f902d4..ea31eb9 100644 --- a/oci-cli.changes +++ b/oci-cli.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Wed Jan 3 12:22:01 UTC 2024 - John Paul Adrian Glaubitz + +- Update to version 3.37.1 + * Support for carbon footprint reporting in the Usage Service + * ``oci usage-api average-carbon-emission request`` + * ``oci usage-api clean-energy-usage request`` + * ``oci usage-api configuration request-usage-carbon-emission-config`` + * ``oci usage-api usage-carbon-emission-summary request-usage-carbon-emissions`` + * ``oci usage-api usage-carbon-emissions-query create`` + * ``oci usage-api usage-carbon-emissions-query delete`` + * ``oci usage-api usage-carbon-emissions-query get`` + * ``oci usage-api usage-carbon-emissions-query list`` + * ``oci usage-api usage-carbon-emissions-query update`` + * Support for change compartment of configurations in the PostgreSQL service + * ``oci psql configuration change-compartment`` + * Support for Token Exchange in the IdentityDomains Service + * ``oci identity-domains identity-propagation-trust`` + * Support for resource locking in the Data Catalog Service + * ``oci data-catalog catalog add`` + * ``oci data-catalog catalog remove`` + * ``oci data-catalog catalog-private-endpoint add`` + * ``oci data-catalog catalog-private-endpoint remove`` + * ``oci data-catalog metastore add`` + * ``oci data-catalog metastore remove`` + * Support for new optional parameter --dedicated-vm-host-id in the Core Service + * ``oci compute instance update --dedicated-vm-host-id`` + * Support for additional attributes for existing APIs in the Data Safe Service + * ``oci data-safe sensitive-data-model list-discovery-analytics --is-common, --sensitive-type-id`` + * ``oci data-safe sensitive-type list --is-common`` + * Cloud Advisor Service + * Support for non root compartment in list commands for resource action summary and history summary + * ``oci optimizer resource-action-summary list -c `` + * ``oci optimizer history-summary list -c `` + * Support for new optional parameter resource metadata in resource actions + * ``oci optimizer resource-action-summary list -c --include-resource-metadata`` + * ``oci optimizer resource-action get --resource-action-id + --include-resource-metadata`` + * ``oci optimizer history-summary list -c --include-resource-metadata`` + * Data Integration Service + * Support for concurrency throttling on + * ``oci data-integration workspace oci data-integration task create`` + * Support for incremental extract, updates to + * ``oci data-integration workspace oci data-integration dataflow create` + * Goldengate Service + * Support for routing method for GoldenGate connections + * ``oci goldengate connection create--connection --routing-method`` + * Support for subnetId update of GoldenGate connections + * ``oci goldengate connection update--connection --subnet-id`` +- Refresh patches for new version + * oc_relax-python-depends.patch +- Update BuildRequires and Requires from setup.py + ------------------------------------------------------------------- Thu Dec 7 14:08:08 UTC 2023 - John Paul Adrian Glaubitz diff --git a/oci-cli.spec b/oci-cli.spec index bf82294..2b13005 100644 --- a/oci-cli.spec +++ b/oci-cli.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ %bcond_with test %endif Name: oci-cli%{psuffix} -Version: 3.37.0 +Version: 3.37.1 Release: 0 Summary: Oracle Cloud Infrastructure CLI License: Apache-2.0 @@ -46,7 +46,7 @@ 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.117.0 +BuildRequires: python3-oci-sdk >= 2.118.0 BuildRequires: python3-pyOpenSSL >= 22.1.0 BuildRequires: python3-python-dateutil >= 2.5.3 BuildRequires: python3-pytz >= 2016.10 @@ -85,7 +85,7 @@ 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.117.0 +Requires: python3-oci-sdk >= 2.118.0 Requires: python3-prompt_toolkit >= 3.0.29 Requires: python3-pyOpenSSL >= 22.1.0 Requires: python3-python-dateutil >= 2.5.3