commit 7ef8454b90d3042643ad6b62ab931c0952f8f8596e3f278a71955d69c44498ee Author: John Paul Adrian Glaubitz Date: Wed Sep 4 06:40:57 2019 +0000 Accepting request 726723 from home:glaubitz:branches:Cloud:Tools - Initial build + Version 2.6.2 - Add patch to relax Python dependencies in requirements.txt and setup.py + oc_relax-python-depends.patch - Disable testsuite as it currently requires an OCI account + https://github.com/oracle/oci-cli/issues/187 OBS-URL: https://build.opensuse.org/request/show/726723 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/oci-cli?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/oc_relax-python-depends.patch b/oc_relax-python-depends.patch new file mode 100644 index 0000000..fe54987 --- /dev/null +++ b/oc_relax-python-depends.patch @@ -0,0 +1,121 @@ +diff -Nru oci-cli-2.6.2.orig/requirements.txt oci-cli-2.6.2/requirements.txt +--- oci-cli-2.6.2.orig/requirements.txt 2019-08-27 20:15:09.000000000 +0200 ++++ oci-cli-2.6.2/requirements.txt 2019-08-28 12:15:50.515766252 +0200 +@@ -2,40 +2,39 @@ + # (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.10.0 ++appdirs>=1.4.3 ++arrow>=0.10.0 + certifi + cffi>=1.9.1 +-click==6.7 +-configparser==3.5.0 +-coverage==4.5.1 +-cryptography==2.4.2 +-httpsig-cffi==15.0.0 +-idna>=2.5,<2.7 +-Jinja2==2.10.1 +-jmespath==0.9.3 +-ndg-httpsclient==0.4.2 +-mock==2.0.0 +-oci==2.3.2 +-packaging==16.8 +-pluggy==0.4.0 +-py==1.4.33 +-pyasn1==0.2.3 +-pyOpenSSL==18.0.0 +-pycparser==2.17 +-pyparsing==2.2.0 +-pytest==3.2.3 +-pytest-cov==2.5.1 +-python-dateutil==2.7.3 +-pytz==2016.10 +-requests==2.21.0 +-retrying==1.3.3 +-six==1.11.0 +-sphinx==1.6.4 +-sphinx-rtd-theme==0.2.5b1 +-terminaltables==3.1.0 +-tox==2.9.1 +-vcrpy==1.13.0 +-virtualenv==15.1.0 +-pytest-xdist==1.22.2 +-PyYAML==3.13 ++click>=6.7 ++coverage>=4.5.1 ++cryptography>=2.4.2 ++httpsig-cffi>=15.0.0 ++idna>=2.5 ++Jinja2>=2.10.1 ++jmespath>=0.9.3 ++ndg-httpsclient>=0.4.2 ++mock>=2.0.0 ++oci>=2.3.2 ++packaging>=16.8 ++pluggy>=0.4.0 ++py>=1.4.33 ++pyasn1>=0.2.3 ++pyOpenSSL>=18.0.0 ++pycparser>=2.17 ++pyparsing>=2.2.0 ++pytest>=3.2.3 ++pytest-cov>=2.5.1 ++python-dateutil>=2.7.3 ++pytz>=2016.10 ++requests>=2.21.0 ++retrying>=1.3.3 ++six>=1.11.0 ++sphinx>=1.6.4 ++sphinx-rtd-theme>=0.2.5b1 ++terminaltables>=3.1.0 ++tox>=2.9.1 ++vcrpy>=1.13.0 ++virtualenv>=15.1.0 ++pytest-xdist>=1.22.2 ++PyYAML>=3.13 +diff -Nru oci-cli-2.6.2.orig/setup.py oci-cli-2.6.2/setup.py +--- oci-cli-2.6.2.orig/setup.py 2019-08-27 20:15:09.000000000 +0200 ++++ oci-cli-2.6.2/setup.py 2019-08-28 12:15:43.071745771 +0200 +@@ -29,25 +29,24 @@ + readme = f.read() + + requires = [ +- 'oci==2.3.2', +- 'arrow==0.10.0', ++ 'oci>=2.3.2', ++ 'arrow>=0.10.0', + 'certifi', +- 'click==6.7', +- 'configparser==3.5.0', +- 'cryptography==2.4.2', +- 'jmespath==0.9.3', +- 'python-dateutil==2.7.3', +- 'pytz==2016.10', +- 'retrying==1.3.3', +- 'six==1.11.0', +- 'terminaltables==3.1.0', +- 'idna>=2.5,<2.7', +- 'pyOpenSSL==18.0.0', +- 'PyYAML==3.13' ++ 'click>=6.7', ++ 'cryptography>=2.4.2', ++ 'jmespath>=0.9.3', ++ 'python-dateutil>=2.7.3', ++ 'pytz>=2016.10', ++ 'retrying>=1.3.3', ++ 'six>=1.11.0', ++ 'terminaltables>=3.1.0', ++ 'idna>=2.5', ++ 'pyOpenSSL>=18.0.0', ++ 'PyYAML>=3.13' + ] + + extras = { +- 'db': ['cx_Oracle==7.0'] ++ 'db': ['cx_Oracle>=7.0'] + } + + fips_libcrypto_file = os.getenv("OCI_CLI_FIPS_LIBCRYPTO_FILE") diff --git a/oci-cli.changes b/oci-cli.changes new file mode 100644 index 0000000..e8a510f --- /dev/null +++ b/oci-cli.changes @@ -0,0 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 28 10:20:57 UTC 2019 - John Paul Adrian Glaubitz + +- Initial build + + Version 2.6.2 +- Add patch to relax Python dependencies in requirements.txt and setup.py + + oc_relax-python-depends.patch +- Disable testsuite as it currently requires an OCI account + + https://github.com/oracle/oci-cli/issues/187 diff --git a/oci-cli.spec b/oci-cli.spec new file mode 100644 index 0000000..6c5a5e2 --- /dev/null +++ b/oci-cli.spec @@ -0,0 +1,118 @@ +# +# spec file for package python-oci-cli +# +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ + +Name: oci-cli +Version: 2.6.2 +Release: 0 +License: Apache-2.0 +Summary: Oracle Cloud Infrastructure CLI +Url: https://docs.us-phoenix-1.oraclecloud.com/Content/API/SDKDocs/cli.htm +Group: Development/Languages/Python +Source: https://github.com/oracle/oci-cli/archive/v%{version}.tar.gz +Patch0: oc_relax-python-depends.patch +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-appdirs >= 1.4.3 +BuildRequires: python3-arrow >= 0.10.0 +BuildRequires: python3-certifi +BuildRequires: python3-cffi >= 1.9.1 +BuildRequires: python3-click >= 6.7 +BuildRequires: python3-coverage >= 4.5.1 +BuildRequires: python3-cryptography >= 2.4.2 +BuildRequires: python3-httpsig_cffi >= 15.0.0 +BuildRequires: python3-idna >= 2.5 +BuildRequires: python3-Jinja2 >= 2.10.1 +BuildRequires: python3-PyJWT +BuildRequires: python3-jmespath >= 0.9.3 +BuildRequires: python3-mock >= 2.0.0 +BuildRequires: python3-ndg-httpsclient >= 0.4.2 +BuildRequires: python3-oci-sdk >= 2.2.14 +BuildRequires: python3-packaging >= 16.8 +BuildRequires: python3-pluggy >= 0.4.0 +BuildRequires: python3-py >= 1.4.33 +BuildRequires: python3-pyasn1 >= 0.2.3 +BuildRequires: python3-pyOpenSSL >= 18.0.0 +BuildRequires: python3-pycparser >= 2.17 +BuildRequires: python3-pyparsing >= 2.2.0 +BuildRequires: python3-python-dateutil >= 2.7.3 +BuildRequires: python3-pytest >= 3.2.3 +BuildRequires: python3-pytest-cov >= 2.5.1 +BuildRequires: python3-pytest-xdist >= 1.22.2 +BuildRequires: python3-pytz >= 2016.10 +BuildRequires: python3-PyYAML >= 3.13 +BuildRequires: python3-requests >= 2.21.0 +BuildRequires: python3-retrying >= 1.3.3 +BuildRequires: python3-six >= 1.11.0 +BuildRequires: python3-Sphinx >= 1.6.4 +BuildRequires: python3-sphinx_rtd_theme >= 0.2.5 +BuildRequires: python3-terminaltables >= 3.1.0 +BuildRequires: python3-tox >= 2.9.1 +BuildRequires: python3-vcrpy >= 1.13.0 +BuildRequires: python3-virtualenv >= 15.1.0 +BuildRequires: fdupes +Requires: python3-arrow >= 0.10.0 +Requires: python3-certifi +Requires: python3-click >= 6.7 +Requires: python3-cryptography >= 2.4.2 +Requires: python3-httpsig_cffi >= 15.0.0 +Requires: python3-idna >= 2.5 +Requires: python3-jmespath >= 0.9.3 +Requires: python3-oci-sdk >= 2.1.5 +Requires: python3-pyOpenSSL >= 18.0.0 +Requires: python3-python-dateutil >= 2.7.3 +Requires: python3-pytz >= 2016.10 +Requires: python3-retrying >= 1.3.3 +Requires: python3-six >= 1.11.0 +Requires: python3-terminaltables >= 3.1.0 +BuildArch: noarch + +%description +The CLI is a small footprint tool that you can use on its own or with the +Console to complete Oracle Cloud Infrastructure tasks. The CLI provides +the same core functionality as the Console, plus additional commands. +Some of these, such as the ability to run scripts, extend the Console's +functionality. + +%prep +%setup -q -n oci-cli-%{version} +%patch0 -p1 +# Fix includes +sed -i 's/from oci._vendor //' src/oci_cli/*.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 tests/*.py tests/vcr_mods/*.py + +%build +python3 setup.py build + +# Disable testsuite as it currently requires an OCI account +# https://github.com/oracle/oci-cli/issues/187 +#%%check +#export PYTHONDONTWRITEBYTECODE=1 +#export PYTHONPATH=%{buildroot}%{python3_sitelib} +#py.test -s tests/unit + +%install +python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir} +%fdupes %{buildroot}%{python3_sitelib} + +%files +%doc CHANGELOG.rst README.rst +%license LICENSE.txt +%{_bindir}/bmcs +%{_bindir}/oci +%{_bindir}/create_backup_from_onprem +%{python3_sitelib}/* + +%changelog diff --git a/v2.6.2.tar.gz b/v2.6.2.tar.gz new file mode 100644 index 0000000..e133954 --- /dev/null +++ b/v2.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:548b26fbf18c77daee22b05b3a53939de17f6f2a888317ae59073b0187617b09 +size 1114082