pool/oci-cli
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 894935 from Cloud:Tools

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/894935
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/oci-cli?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2021-05-22 22:06:14 +00:00 committed by Git OBS Bridge
commit 93847d9cf9
5 changed files with 80 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
oc_relax-python-depends.patch
View File

@ -1,14 +1,14 @@
diff -Nru oci-cli-2.24.4.orig/requirements.txt oci-cli-2.24.4/requirements.txt
--- oci-cli-2.24.4.orig/requirements.txt 2021-05-11 22:38:54.000000000 +0200
+++ oci-cli-2.24.4/requirements.txt 2021-05-14 13:21:01.440182907 +0200
@@ -2,41 +2,40 @@
diff -Nur oci-cli-2.24.5/requirements.txt new/requirements.txt
--- oci-cli-2.24.5/requirements.txt 2021-05-19 01:47:14.000000000 +0200
+++ new/requirements.txt 2021-05-20 18:19:50.801629082 +0200
@@ -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.
-appdirs==1.4.3
-arrow==0.17.0
+appdirs>=1.4.3
+arrow>=0.17.0
+appdirs~=1.4.3
+arrow~=0.17.0
certifi
cffi>=1.9.1
-click==6.7
@ -20,7 +20,7 @@ diff -Nru oci-cli-2.24.4.orig/requirements.txt oci-cli-2.24.4/requirements.txt
-jmespath==0.10.0
-ndg-httpsclient==0.4.2
-mock==2.0.0
-oci==2.38.2
-oci==2.38.3
-packaging==20.2
-pluggy==0.13.0
-py==1.10.0
@ -30,30 +30,31 @@ diff -Nru oci-cli-2.24.4.orig/requirements.txt oci-cli-2.24.4/requirements.txt
-pyparsing==2.2.0
-pytest==3.2.3
-pytest-cov==2.5.1
+click>=6.7
+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.38.2
+packaging>=20.2
+pluggy>=0.13.0
+py>=1.10.0
+pyasn1>=0.2.3
+pyOpenSSL>=19.1.0
+pycparser>=2.20
+pyparsing>=2.2.0
+pytest>=3.2.3
+pytest-cov>=2.5.1
+click~=6.7
+configparser~=4.0.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.38.3
+packaging~=20.2
+pluggy~=0.13.0
+py~=1.10.0
+pyasn1~=0.2.3
+pyOpenSSL~=19.1.0
+pycparser~=2.20
+pyparsing~=2.2.0
+pytest~=3.2.3
+pytest-cov~=2.5.1
python-dateutil>=2.5.3,<3.0.0
pytz>=2016.10
-requests==2.21.0
-retrying==1.3.3
+requests>=2.21.0
+retrying>=1.3.3
+requests~=2.21.0
+retrying~=1.3.3
setuptools<45
-six==1.14.0
-sphinx==1.6.4
@ -65,35 +66,36 @@ diff -Nru oci-cli-2.24.4.orig/requirements.txt oci-cli-2.24.4/requirements.txt
-pytest-xdist==1.22.2
-pytest-forked==1.0.2
-PyYAML==5.4.1
+six>=1.14.0
+sphinx>=1.6.4
+sphinx-rtd-theme>=0.2.5b1
+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.1
diff -Nru oci-cli-2.24.4.orig/setup.py oci-cli-2.24.4/setup.py
--- oci-cli-2.24.4.orig/setup.py 2021-05-11 22:38:54.000000000 +0200
+++ oci-cli-2.24.4/setup.py 2021-05-14 13:21:19.100333555 +0200
@@ -30,24 +30,23 @@
+six~=1.14.0
+sphinx~=1.6.4
+sphinx-rtd-theme~=0.2.5b1
+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.1
diff -Nur oci-cli-2.24.5/setup.py new/setup.py
--- oci-cli-2.24.5/setup.py 2021-05-19 01:47:14.000000000 +0200
+++ new/setup.py 2021-05-20 18:19:50.801629082 +0200
@@ -30,24 +30,24 @@
readme = f.read()
requires = [
- 'oci==2.38.2',
- 'oci==2.38.3',
- 'arrow==0.17.0',
+ 'oci>=2.38.2',
+ 'arrow>=0.17.0',
+ 'oci~=2.38.3',
+ 'arrow~=0.17.0',
'certifi',
- 'click==6.7',
- 'configparser==4.0.2',
- 'cryptography==3.3.2',
- 'jmespath==0.10.0',
+ 'click>=6.7',
+ 'cryptography>=3.3.2',
+ 'jmespath>=0.10.0',
+ 'click~=6.7',
+ 'configparser~=4.0.2',
+ 'cryptography~=3.3.2',
+ 'jmespath~=0.10.0',
'python-dateutil>=2.5.3,<3.0.0',
'pytz>=2016.10',
- 'retrying==1.3.3',
@ -101,16 +103,16 @@ diff -Nru oci-cli-2.24.4.orig/setup.py oci-cli-2.24.4/setup.py
- 'terminaltables==3.1.0',
- 'pyOpenSSL==19.1.0',
- 'PyYAML==5.4.1'
+ 'retrying>=1.3.3',
+ 'six>=1.14.0',
+ 'terminaltables>=3.1.0',
+ 'pyOpenSSL>=19.1.0',
+ 'PyYAML>=5.4.1'
+ 'retrying~=1.3.3',
+ 'six~=1.14.0',
+ 'terminaltables~=3.1.0',
+ 'pyOpenSSL~=19.1.0',
+ 'PyYAML~=5.4.1'
]
extras = {
- 'db': ['cx_Oracle==7.0']
+ 'db': ['cx_Oracle>=7.0']
+ 'db': ['cx_Oracle~=7.0']
}
fips_libcrypto_file = os.getenv("OCI_CLI_FIPS_LIBCRYPTO_FILE")

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

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

12
oci-cli.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu May 20 16:16:13 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
- Update to version 2.24.5
* Support for Object storage configuration source in the
Resource Manager service
* Support for spark-submit compatible options in the Data Flow service
* Fixed: Wait for state parameter for the following commands were
returning an error on valid states
* Fixed list commands in Artifacts service
- Refresh oc_relax-python-depends.patch
-------------------------------------------------------------------
Fri May 14 11:21:31 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>

21
oci-cli.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package oci-cli-test
# spec file for package oci-cli
#
# Copyright (c) 2021 SUSE LLC
#
@ -28,16 +28,17 @@
%bcond_with test
%endif
Name: oci-cli%{psuffix}
Version: 2.24.4
Version: 2.24.5
Release: 0
Summary: Oracle Cloud Infrastructure CLI
License: Apache-2.0
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
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
@ -46,7 +47,7 @@ BuildRequires: python3-click >= 6.7
BuildRequires: python3-cryptography >= 3.3.2
BuildRequires: python3-devel
BuildRequires: python3-jmespath >= 0.9.4
BuildRequires: python3-oci-sdk >= 2.38.2
BuildRequires: python3-oci-sdk >= 2.38.3
BuildRequires: python3-pyOpenSSL >= 18.0.0
BuildRequires: python3-python-dateutil >= 2.5.3
BuildRequires: python3-pytz >= 2016.10
@ -84,7 +85,7 @@ Requires: python3-certifi
Requires: python3-click >= 6.7
Requires: python3-cryptography >= 3.3.2
Requires: python3-jmespath >= 0.10.0
Requires: python3-oci-sdk >= 2.38.2
Requires: python3-oci-sdk >= 2.38.3
Requires: python3-pyOpenSSL >= 18.0.0
Requires: python3-python-dateutil >= 2.5.3
Requires: python3-pytz >= 2016.10
@ -102,25 +103,23 @@ Some of these, such as the ability to run scripts, extend the Console's
functionality.
%prep
%setup -q -n oci-cli-%{version}
%patch0 -p1
%patch1 -p1
%autosetup -p1
# Fix includes
sed -i 's/from oci._vendor //' src/oci_cli/*.py services/container_engine/src/oci_cli_container_engine/*.py services/object_storage/src/oci_cli_object_storage/object_storage_transfer_manager/*.py services/dts/src/oci_cli_dts/physical_appliance_control_plane/client/*.py services/dts/src/oci_cli_dts/*.py tests/*.py
sed -i 's/oci\._vendor\.//' src/oci_cli/*.py services/dts/src/oci_cli_dts/*.py services/container_engine/src/oci_cli_container_engine/*.py tests/*.py tests/vcr_mods/*.py
%build
python3 setup.py build
%python3_build
%check
%if %{with test}
%check
export PYTHONDONTWRITEBYTECODE=1
export PYTHONPATH=%{buildroot}%{python3_sitelib}
py.test -s tests/unit
%endif
%install
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir}
%python3_install
%fdupes %{buildroot}%{python3_sitelib}
%files

3
v2.24.4.tar.gz
View File

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