glaubitz/oci-cli
SHA256
1
0
Fork 0
forked from pool/oci-cli
Code Pull Requests Activity

Accepting request 914960 from Cloud:Tools

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/914960
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/oci-cli?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2021-08-30 11:55:23 +00:00 committed by Git OBS Bridge
commit a2a67e63ec
6 changed files with 131 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oc_name-defaults_file-parameter.patch
View File

@ -1,12 +0,0 @@
diff -Nru oci-cli-2.21.1.orig/src/oci_cli/cli_root.py oci-cli-2.21.1/src/oci_cli/cli_root.py
--- oci-cli-2.21.1.orig/src/oci_cli/cli_root.py 2021-02-09 20:32:49.000000000 +0100
+++ oci-cli-2.21.1/src/oci_cli/cli_root.py 2021-02-15 14:53:16.002718177 +0100
@@ -299,7 +299,7 @@
@click.option('--profile',
default=Sentinel(DEFAULT_PROFILE), show_default=False,
help='The profile in the config file to load. This profile will also be used to locate any default parameter values which have been specified in the OCI CLI-specific configuration file. [default: DEFAULT]')
-@click.option('--cli-rc-file', '--defaults-file',
+@click.option('--cli-rc-file', '--defaults-file', 'defaults_file',
default=cli_constants.CLI_RC_DEFAULT_LOCATION, show_default=True,
is_eager=True, callback=eager_load_cli_rc_file,
help='The path to the OCI CLI-specific configuration file, containing parameter default values and other configuration information such as command aliases and predefined queries. The --defaults-file option is deprecated and you should use the --cli-rc-file option instead.')

61
oc_relax-python-depends.patch
View File

@ -1,7 +1,7 @@
diff -Nru oci-cli-2.26.4.orig/requirements.txt oci-cli-2.26.4/requirements.txt
--- oci-cli-2.26.4.orig/requirements.txt 2021-07-27 20:09:09.000000000 +0200
+++ oci-cli-2.26.4/requirements.txt 2021-08-03 15:54:35.684471717 +0200
@@ -2,40 +2,39 @@
diff -u oci-cli-3.0.2.orig/requirements.txt oci-cli-3.0.2/requirements.txt
--- oci-cli-3.0.2.orig/requirements.txt 2021-08-24 23:34:54.000000000 +0200
+++ oci-cli-3.0.2/requirements.txt 2021-08-25 14:48:54.526458992 +0200
@@ -2,41 +2,40 @@
# (https://pip.pypa.io/en/stable/reference/pip_install/#requirements-file-format),
# you may need to use the --extra-index-url option instead.
@ -11,7 +11,7 @@ diff -Nru oci-cli-2.26.4.orig/requirements.txt oci-cli-2.26.4/requirements.txt
+arrow>=0.17.0
certifi
cffi>=1.9.1
-click==6.7
-click==7.1.2
-configparser==4.0.2
-coverage==4.5.2
-cryptography==3.3.2
@ -20,7 +20,7 @@ diff -Nru oci-cli-2.26.4.orig/requirements.txt oci-cli-2.26.4/requirements.txt
-jmespath==0.10.0
-ndg-httpsclient==0.4.2
-mock==2.0.0
-oci==2.43.1
-oci==2.44.1
-packaging==20.2
-pluggy==0.13.0
-py==1.10.0
@ -31,15 +31,15 @@ diff -Nru oci-cli-2.26.4.orig/requirements.txt oci-cli-2.26.4/requirements.txt
-pytest==3.2.3
-pytest-cov==2.5.1
-python-dateutil>=2.5.3,<3.0.0
+click>=6.7
+configparser>=4.0.2
+click>=7.1.2
+coverage>=4.5.2
+cryptography>=3.3.2
+httpsig-cffi>=15.0.0
+Jinja2>=2.11.3
+jmespath>=0.10.0
+ndg-httpsclient>=0.4.2
+mock>=2.0.0
+oci>=2.43.1
+oci>=2.44.1
+packaging>=20.2
+pluggy>=0.13.0
+py>=1.10.0
@ -54,52 +54,53 @@ diff -Nru oci-cli-2.26.4.orig/requirements.txt oci-cli-2.26.4/requirements.txt
-requests==2.21.0
+requests>=2.21.0
setuptools<45
-six==1.14.0
-sphinx==1.6.4
-sphinx-rtd-theme==0.2.5b1
six>=1.15.0
-sphinx==2.2.1
-sphinx-rtd-theme==0.4.3
-terminaltables==3.1.0
-tox==3.23.0
-vcrpy==1.13.0
-virtualenv==16.7.10
-pytest-xdist==1.22.2
-pytest-forked==1.0.2
-PyYAML>=5.4,<6
+six>=1.14.0
+sphinx>=1.6.4
+sphinx-rtd-theme>=0.2.5b1
+sphinx>=2.2.1
+sphinx-rtd-theme>=0.4.3
+terminaltables>=3.1.0
+tox>=3.23.0
+vcrpy>=1.13.0
+virtualenv>=16.7.10
+pytest-xdist>=1.22.2
+pytest-forked>=1.0.2
+PyYAML>=5.4
diff -Nru oci-cli-2.26.4.orig/setup.py oci-cli-2.26.4/setup.py
--- oci-cli-2.26.4.orig/setup.py 2021-07-27 20:09:09.000000000 +0200
+++ oci-cli-2.26.4/setup.py 2021-08-03 15:55:02.220778206 +0200
@@ -30,23 +30,22 @@
PyYAML>=5.4,<6
-docutils==0.15.2
+docutils>=0.15.2
Common subdirectories: oci-cli-3.0.2.orig/scripts and oci-cli-3.0.2/scripts
Common subdirectories: oci-cli-3.0.2.orig/services and oci-cli-3.0.2/services
diff -u oci-cli-3.0.2.orig/setup.py oci-cli-3.0.2/setup.py
--- oci-cli-3.0.2.orig/setup.py 2021-08-24 23:34:54.000000000 +0200
+++ oci-cli-3.0.2/setup.py 2021-08-25 14:49:19.054650877 +0200
@@ -29,23 +29,23 @@
readme = f.read()
requires = [
- 'oci==2.43.1',
- 'oci==2.44.1',
- 'arrow==0.17.0',
+ 'oci>=2.43.1',
+ 'oci>=2.44.1',
+ 'arrow>=0.17.0',
'certifi',
- 'click==6.7',
- 'click==7.1.2',
- 'configparser==4.0.2',
- 'cryptography>=3.2.1,<=3.4.7',
+ 'click>=7.1.2',
+ 'configparser>=4.0.2',
'cryptography>3.2.1,<=3.4.7',
- 'jmespath==0.10.0',
- 'python-dateutil>=2.5.3,<3.0.0',
+ 'click>=6.7',
+ 'cryptography>=3.2.1',
+ 'jmespath>=0.10.0',
+ 'python-dateutil>=2.5.3',
'pytz>=2016.10',
- 'six==1.14.0',
'six>=1.15.0',
- 'terminaltables==3.1.0',
- 'pyOpenSSL==19.1.0',
+ 'six>=1.14.0',
+ 'terminaltables>=3.1.0',
+ 'pyOpenSSL>=19.1.0',
'PyYAML>=5.4,<6'
@ -111,3 +112,5 @@ diff -Nru oci-cli-2.26.4.orig/setup.py oci-cli-2.26.4/setup.py
}
fips_libcrypto_file = os.getenv("OCI_CLI_FIPS_LIBCRYPTO_FILE")
Common subdirectories: oci-cli-3.0.2.orig/src and oci-cli-3.0.2/src
Common subdirectories: oci-cli-3.0.2.orig/tests and oci-cli-3.0.2/tests

3
oci-cli-2.26.4.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cfae43864a75f6b69130fffdbbb5aea8fe7dfaf2c069a02eee30320697a9477b
size 1870156

3
oci-cli-3.0.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:91819d514315aed984c1c5ff3fde1413c9d4c62f9d5a5b2f35e0997114d9f1a1
size 1895130

76
oci-cli.changes
View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Wed Aug 25 13:20:44 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- Update to version 3.0.2
* Support to generate recommended vm cluster network and create vm cluster
network with given customer listener port in the Database service
* ``oci db exadata-infrastructure generate-recommended-vm-cluster-network
--scan-listener-port-tcp, --scan-listener-port-tcp-ssl``
* ``oci db vm-cluster-network create --scans``
* Prompt to create a config file with a CLI session profile if a CLI command
is run with a nonexistent config file and --auth security_token
* Prompt to re-authenticate a CLI session profile if a CLI command is run with
an expired session token and --auth security_token
* Modified supported versions for the following packages:
cryptography (>3.2.1, <=3.4.7), click (7.1.2).
- from version 3.0.1
* Support for identifying Management Agent hosts eligible to create
Operations Insights Host resources on
* ``oci opsi host-insights list-importable-agent-entities``
* Support for summarize-agen-counts and summarize-plugin-counts
in Management Agent service
* ``oci management-agent agent summarize-agent-counts``
* ``oci management-agent agent summarize-plugin-counts``
* Support for additional filters when listing management agents
in Management Agent service
* ``oci management-agent agent list --availability-status,
--host-id, --is-customer-deployed``
* Modified supported versions for the following packages: six (>=0.15.0).
* Check the bucket exists before bulk and sync operations in Object Storage service
* ``oci os object bulk-upload``
* ``oci os object bulk-download``
* ``oci os object sync``
* Session authentication now has no private key passphrase prompt by default; private key
passphrase can be provided by running session authenticate with --use-passphrase option
* ``oci session authenticate``
- from version 3.0.0
[BREAKING] Drop support for Python 2
* Support for ``os object sync`` command that synchronizes a filesystem directory with
an Object Storage bucket in the Object Storage service.
* ``oci os object sync``
* Support for --availability-domain option when listing VNICs attached
to an instance in the Compute service
* ``oci compute instance list-vnics --availability-domain``
* Support for Autonomous Database Create with Early Patching via a new parameter
(maintenance-schedule-type) in the Database service.
* ``oci db autonomous-database create --maintenance-schedule-type``
* ``oci db autonomous-database create-adb-cross-region-data-guard-details
--maintenance-schedule-type``
* ``oci db autonomous-database create-from-backup-id --maintenance-schedule-type``
* ``oci db autonomous-database create-from-backup-timestamp --maintenance-schedule-type``
* ``oci db autonomous-database create-from-clone --maintenance-schedule-type``
* ``oci db autonomous-database create-virtual-clone --maintenance-schedule-type``
* Support for non-default config file locations for the below commands
* ``oci session refresh``
* ``oci session export``
* ``oci session import``
* Support for Model Catalog v2.0 features including Provenance,
Metadata, Schema, Artifact introspection
* ``oci data-science model``
* Support for new parameter --metastore-id to specify external hive metastore
for Application in the Data Flow service
* ``oci data-flow application create --metastore-id``
* ``oci data-flow application update --metastore-id``
* Support for manual copy of volume group backups across regions in the Block Storage service
* ``oci bv volume-group-backup copy``
* Support for MDS Backup Change Compartment in MySql service
* ``oci mysql backup change-compartment``
* Block volume backup copy operations now wait for their associated work requests to complete
* ``oci bv boot-volume-backup copy``
* ``oci bv backup copy``
- Refresh patches for new version
+ oc_relax-python-depends.patch
- Drop patch for compatibility with click >= 7.0, fixed upstream
+ oc_name-defaults_file-parameter.patch
- Update BuildRequires and Requires from setup.py
-------------------------------------------------------------------
Tue Aug 3 15:33:40 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>

42
oci-cli.spec
View File

@ -28,7 +28,7 @@
%bcond_with test
%endif
Name: oci-cli%{psuffix}
Version: 2.26.4
Version: 3.0.2
Release: 0
Summary: Oracle Cloud Infrastructure CLI
License: Apache-2.0
@ -36,59 +36,58 @@ 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
Patch1: oc_name-defaults_file-parameter.patch
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: python3-PyJWT
BuildRequires: python3-PyYAML >= 5.4.1
BuildRequires: python3-arrow >= 0.14.7
BuildRequires: python3-arrow >= 0.17.0
BuildRequires: python3-certifi
BuildRequires: python3-click >= 6.7
BuildRequires: python3-click >= 7.1.2
BuildRequires: python3-cryptography >= 3.2.1
BuildRequires: python3-devel
BuildRequires: python3-jmespath >= 0.9.4
BuildRequires: python3-oci-sdk >= 2.43.1
BuildRequires: python3-pyOpenSSL >= 18.0.0
BuildRequires: python3-jmespath >= 0.10.0
BuildRequires: python3-oci-sdk >= 2.44.1
BuildRequires: python3-pyOpenSSL >= 19.1.0
BuildRequires: python3-python-dateutil >= 2.5.3
BuildRequires: python3-pytz >= 2016.10
BuildRequires: python3-setuptools
BuildRequires: python3-six >= 1.14.0
BuildRequires: python3-six >= 1.15.0
BuildRequires: python3-terminaltables >= 3.1.0
%if %{with test}
BuildRequires: python3-Jinja2 >= 2.10.1
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-mock >= 2.0.0
BuildRequires: python3-ndg-httpsclient >= 0.4.2
BuildRequires: python3-packaging >= 16.8
BuildRequires: python3-pluggy >= 0.4.0
BuildRequires: python3-py >= 1.4.33
BuildRequires: python3-packaging >= 20.2
BuildRequires: python3-pluggy >= 0.13.0
BuildRequires: python3-py >= 1.10.0
BuildRequires: python3-pyasn1 >= 0.2.3
BuildRequires: python3-pycparser >= 2.17
BuildRequires: python3-pycparser >= 2.20
BuildRequires: python3-pyparsing >= 2.2.0
BuildRequires: python3-pytest >= 3.2.3
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.2.5
BuildRequires: python3-tox >= 2.9.1
BuildRequires: python3-sphinx_rtd_theme >= 0.4.3
BuildRequires: python3-tox >= 3.23.0
BuildRequires: python3-vcrpy >= 1.13.0
BuildRequires: python3-virtualenv >= 15.1.0
BuildRequires: python3-virtualenv >= 16.7.10
%endif
Requires: python3-PyYAML >= 5.4.1
Requires: python3-arrow >= 0.14.7
Requires: python3-arrow >= 0.17.0
Requires: python3-certifi
Requires: python3-click >= 6.7
Requires: python3-click >= 7.1.2
Requires: python3-cryptography >= 3.2.1
Requires: python3-jmespath >= 0.10.0
Requires: python3-oci-sdk >= 2.43.1
Requires: python3-pyOpenSSL >= 18.0.0
Requires: python3-oci-sdk >= 2.44.1
Requires: python3-pyOpenSSL >= 19.1.0
Requires: python3-python-dateutil >= 2.5.3
Requires: python3-pytz >= 2016.10
Requires: python3-six >= 1.14.0
Requires: python3-six >= 1.15.0
Requires: python3-terminaltables >= 3.1.0
BuildArch: noarch
@ -103,7 +102,6 @@ functionality.
%prep
%setup -q -n oci-cli-%{version}
%patch0 -p1
%patch1 -p1
# Fix includes
find . -name "*.py" -exec sed -i 's/from oci\._vendor //' \{\} +
find . -name "*.py" -exec sed -i 's/oci\._vendor\.//' \{\} +