From b2a88b9224ff4209fa5949fa0cf0d5ae0d83f387c34bcbac9ff90283b8823e86 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Wed, 23 Nov 2022 10:01:15 +0000 Subject: [PATCH] Accepting request 1037352 from home:glaubitz:branches:Cloud:Tools - Update to version 3.20.2 * Database service * Support for mTLS authentication with Listener and for providing custom value for TLS port and Non-TLS Port during AVM Cluster Creation on ExaCC * ``oci db autonomous-vm-cluster create --is-mtls-enabled --scan-listener-port-non-tls --scan-listener-port-tls`` * Support for new optional parameters in CloudAutonomousVmClusters * ``oci db cloud-autonomous-vm-cluster create --autonomous-data-storage-size-in-tbs --cpu-core-count-per-node --db-servers --maintenance-window-details --memory-per-oracle-compute-unit-in-gbs --total-container-databases`` * ``oci db cloud-autonomous-vm-cluster update --maintenance-window-details`` * Support for new command in CloudExadataInfrastructure * ``oci db cloud-exadata-infrastructure-unallocated-resources get`` * Support to list resources and outputs associated with resource manager job and stack for the Resource Management service * ``oci resource-manager associated-resource-summary list-job-associated-resources`` * ``oci resource-manager associated-resource-summary list-stack-associated-resources`` * ``oci resource-manager job-output-summary list-job-outputs`` * Improved handling SSL error messages in CLI to enable customers self help - Refresh patches for new version + oc_relax-python-depends.patch - Update BuildRequires and Requires from setup.py OBS-URL: https://build.opensuse.org/request/show/1037352 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/oci-cli?expand=0&rev=61 --- oc_relax-python-depends.patch | 132 +++++++++++++++++++++++++++++++--- oci-cli-3.20.1.tar.gz | 3 - oci-cli-3.20.2.tar.gz | 3 + oci-cli.changes | 26 +++++++ oci-cli.spec | 6 +- 5 files changed, 154 insertions(+), 16 deletions(-) delete mode 100644 oci-cli-3.20.1.tar.gz create mode 100644 oci-cli-3.20.2.tar.gz diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch index 272a18b..24e1643 100644 --- a/oc_relax-python-depends.patch +++ b/oc_relax-python-depends.patch @@ -1,6 +1,6 @@ -diff -Nru oci-cli-3.20.1.orig/requirements.txt oci-cli-3.20.1/requirements.txt ---- oci-cli-3.20.1.orig/requirements.txt 2022-11-08 08:43:52.000000000 +0100 -+++ oci-cli-3.20.1/requirements.txt 2022-11-14 11:48:15.603353504 +0100 +diff -Nru oci-cli-3.20.2.orig/requirements.txt oci-cli-3.20.2/requirements.txt +--- oci-cli-3.20.2.orig/requirements.txt 2022-11-15 12:28:19.000000000 +0100 ++++ oci-cli-3.20.2/requirements.txt 2022-11-22 16:02:52.530811470 +0100 @@ -2,41 +2,41 @@ # (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.20.1.orig/requirements.txt oci-cli-3.20.1/requirements.txt -jmespath==0.10.0 -ndg-httpsclient==0.4.2 -mock==2.0.0 --oci==2.88.0 +-oci==2.88.1 -packaging==20.2 -pluggy==0.13.0 -py==1.10.0 @@ -37,7 +37,7 @@ diff -Nru oci-cli-3.20.1.orig/requirements.txt oci-cli-3.20.1/requirements.txt +jmespath>=0.10.0 +ndg-httpsclient>=0.4.2 +mock>=2.0.0 -+oci>=2.88.0 ++oci>=2.88.1 +packaging>=20.2 +pluggy>=0.13.0 +py>=1.10.0 @@ -75,15 +75,15 @@ diff -Nru oci-cli-3.20.1.orig/requirements.txt oci-cli-3.20.1/requirements.txt +PyYAML>=5.4 +docutils>=0.15.2 +prompt-toolkit>=3.0.29 -diff -Nru oci-cli-3.20.1.orig/setup.py oci-cli-3.20.1/setup.py ---- oci-cli-3.20.1.orig/setup.py 2022-11-08 08:43:52.000000000 +0100 -+++ oci-cli-3.20.1/setup.py 2022-11-14 11:47:37.807302313 +0100 +diff -Nru oci-cli-3.20.2.orig/setup.py oci-cli-3.20.2/setup.py +--- oci-cli-3.20.2.orig/setup.py 2022-11-15 12:28:19.000000000 +0100 ++++ oci-cli-3.20.2/setup.py 2022-11-22 16:01:12.485722400 +0100 @@ -29,23 +29,23 @@ readme = f.read() requires = [ -- 'oci==2.88.0', -+ 'oci>=2.88.0', +- 'oci==2.88.1', ++ 'oci>=2.88.1', 'arrow>=1.0.0', 'certifi', - 'click==7.1.2', @@ -112,3 +112,115 @@ diff -Nru oci-cli-3.20.1.orig/setup.py oci-cli-3.20.1/setup.py } fips_libcrypto_file = os.getenv("OCI_CLI_FIPS_LIBCRYPTO_FILE") +diff -Nru oci-cli-3.20.2.orig/setup.py~ oci-cli-3.20.2/setup.py~ +--- oci-cli-3.20.2.orig/setup.py~ 1970-01-01 01:00:00.000000000 +0100 ++++ oci-cli-3.20.2/setup.py~ 2022-11-15 12:28:19.000000000 +0100 +@@ -0,0 +1,108 @@ ++# coding: utf-8 ++# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. ++# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. ++ ++import io ++import os ++import re ++from setuptools import setup, find_packages ++ ++ ++def open_relative(*path): ++ """ ++ Opens files in read-only with a fixed utf-8 encoding. ++ ++ All locations are relative to this setup.py file. ++ """ ++ here = os.path.abspath(os.path.dirname(__file__)) ++ filename = os.path.join(here, *path) ++ return io.open(filename, mode="r", encoding="utf-8") ++ ++with open_relative("src", "oci_cli", "version.py") as fd: ++ version = re.search( ++ r"^__version__\s*=\s*['\"]([^'\"]*)['\"]", ++ fd.read(), re.MULTILINE).group(1) ++ if not version: ++ raise RuntimeError("Cannot find version information") ++ ++with open_relative("README.rst") as f: ++ readme = f.read() ++ ++requires = [ ++ 'oci==2.88.1', ++ 'arrow>=1.0.0', ++ 'certifi', ++ 'click==7.1.2', ++ 'cryptography>=3.2.1,<=37.0.2', ++ 'jmespath==0.10.0', ++ 'python-dateutil>=2.5.3,<3.0.0', ++ 'pytz>=2016.10', ++ 'six>=1.15.0', ++ 'terminaltables==3.1.0', ++ 'pyOpenSSL>=17.5.0,<=22.0.0', ++ 'PyYAML>=5.4,<6', ++ 'prompt-toolkit==3.0.29' ++] ++ ++extras = { ++ 'db': ['cx_Oracle==8.3'] ++} ++ ++fips_libcrypto_file = os.getenv("OCI_CLI_FIPS_LIBCRYPTO_FILE") ++if fips_libcrypto_file: ++ from setuptools.command.easy_install import ScriptWriter ++ with open('src/oci_cli/oci_template.py', 'r') as template_file: ++ template = template_file.read() ++ ScriptWriter.template = template ++ ++ALL_SERVICES_DIR = "services" ++package_dirs = {"": "src"} ++all_packages = find_packages(where="src") ++package_dirs[ALL_SERVICES_DIR] = os.path.join('.', ALL_SERVICES_DIR) ++all_packages.extend([ALL_SERVICES_DIR]) ++ ++# Populating package_dirs and all_packages from directories under services ++packages = find_packages(where=".") ++service_packages = [] ++for package in packages: ++ if package.startswith("services"): ++ service_packages.append(package) ++ package_path = "." ++ for pkg in package.split("."): ++ package_dirs[package] = os.path.join(package_path, pkg) ++ package_path = os.path.join(package_path, pkg) ++all_packages.extend(service_packages) ++ ++setup( ++ name='oci-cli', ++ url='https://docs.cloud.oracle.com/iaas/Content/API/Concepts/cliconcepts.htm', ++ version=version, ++ author='Oracle', ++ author_email='joe.levy@oracle.com', ++ description='Oracle Cloud Infrastructure CLI', ++ long_description=readme, ++ entry_points={ ++ 'console_scripts': ["oci=oci_cli.cli:cli", ++ "create_backup_from_onprem=oci_cli.scripts.database.dbaas:create_backup_from_onprem"] ++ }, ++ install_requires=requires, ++ extras_require=extras, ++ packages=all_packages, ++ package_dir=package_dirs, ++ include_package_data=True, ++ python_requires='>=3.6', ++ license="Universal Permissive License 1.0 or Apache License 2.0", ++ classifiers=[ ++ "Development Status :: 5 - Production/Stable", ++ "Environment :: Console", ++ "Intended Audience :: Information Technology", ++ "Intended Audience :: Developers", ++ "License :: OSI Approved :: Apache Software License", ++ "License :: OSI Approved :: Universal Permissive License (UPL)", ++ "Programming Language :: Python :: 3 :: Only", ++ "Programming Language :: Python :: 3.6", ++ "Programming Language :: Python :: 3.7", ++ "Programming Language :: Python :: 3.8", ++ "Programming Language :: Python :: 3.9" ++ ] ++) diff --git a/oci-cli-3.20.1.tar.gz b/oci-cli-3.20.1.tar.gz deleted file mode 100644 index dfeeece..0000000 --- a/oci-cli-3.20.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea9107c8ee5c7af1dce99757aa861972693adcfda81393fbb5b14583b9a2c189 -size 2754346 diff --git a/oci-cli-3.20.2.tar.gz b/oci-cli-3.20.2.tar.gz new file mode 100644 index 0000000..39f1042 --- /dev/null +++ b/oci-cli-3.20.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f50a5a9992286b71ba16348b430368a8a0ffb0284e8aefcf88f03fb6e9571ee +size 2754613 diff --git a/oci-cli.changes b/oci-cli.changes index 7748d81..0675720 100644 --- a/oci-cli.changes +++ b/oci-cli.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Nov 22 15:03:34 UTC 2022 - John Paul Adrian Glaubitz + +- Update to version 3.20.2 + * Database service + * Support for mTLS authentication with Listener and for providing custom value for + TLS port and Non-TLS Port during AVM Cluster Creation on ExaCC + * ``oci db autonomous-vm-cluster create --is-mtls-enabled --scan-listener-port-non-tls + --scan-listener-port-tls`` + * Support for new optional parameters in CloudAutonomousVmClusters + * ``oci db cloud-autonomous-vm-cluster create --autonomous-data-storage-size-in-tbs + --cpu-core-count-per-node --db-servers --maintenance-window-details + --memory-per-oracle-compute-unit-in-gbs --total-container-databases`` + * ``oci db cloud-autonomous-vm-cluster update --maintenance-window-details`` + * Support for new command in CloudExadataInfrastructure + * ``oci db cloud-exadata-infrastructure-unallocated-resources get`` + * Support to list resources and outputs associated with resource manager + job and stack for the Resource Management service + * ``oci resource-manager associated-resource-summary list-job-associated-resources`` + * ``oci resource-manager associated-resource-summary list-stack-associated-resources`` + * ``oci resource-manager job-output-summary list-job-outputs`` + * Improved handling SSL error messages in CLI to enable customers self help +- Refresh patches for new version + + oc_relax-python-depends.patch +- Update BuildRequires and Requires from setup.py + ------------------------------------------------------------------- Mon Nov 14 10:49:40 UTC 2022 - John Paul Adrian Glaubitz diff --git a/oci-cli.spec b/oci-cli.spec index 2046593..db81b46 100644 --- a/oci-cli.spec +++ b/oci-cli.spec @@ -28,7 +28,7 @@ %bcond_with test %endif Name: oci-cli%{psuffix} -Version: 3.20.1 +Version: 3.20.2 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.88.0 +BuildRequires: python3-oci-sdk >= 2.88.1 BuildRequires: python3-pyOpenSSL >= 19.1.0 BuildRequires: python3-python-dateutil >= 2.5.3 BuildRequires: python3-pytz >= 2016.10 @@ -82,7 +82,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.88.0 +Requires: python3-oci-sdk >= 2.88.1 Requires: python3-prompt_toolkit >= 3.0.29 Requires: python3-pyOpenSSL >= 19.1.0 Requires: python3-python-dateutil >= 2.5.3