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. -appdirs==1.4.3 +appdirs>=1.4.3 arrow>=1.0.0 certifi cffi>=1.9.1 -click==7.1.2 -coverage==4.5.2 -cryptography>=3.2.1,<=37.0.2 -httpsig-cffi==15.0.0 -Jinja2==3.0.3 -jmespath==0.10.0 -ndg-httpsclient==0.4.2 -mock==2.0.0 -oci==2.88.1 -packaging==20.2 -pluggy==0.13.0 -py==1.10.0 -pyasn1==0.2.3 -pyOpenSSL>=17.5.0,<=22.0.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 +click>=7.1.2 +coverage>=4.5.2 +cryptography>=3.2.1 +httpsig-cffi>=15.0.0 +Jinja2>=3.0.3 +jmespath>=0.10.0 +ndg-httpsclient>=0.4.2 +mock>=2.0.0 +oci>=2.88.1 +packaging>=20.2 +pluggy>=0.13.0 +py>=1.10.0 +pyasn1>=0.2.3 +pyOpenSSL>=17.5.0 +pycparser>=2.20 +pyparsing>=2.2.0 +pytest>=3.2.3 +pytest-cov>=2.5.1 +python-dateutil>=2.5.3 pytz>=2016.10 -requests==2.21.0 +requests>=2.21.0 setuptools<45 six>=1.15.0 -sphinx==3.3.0 -sphinx-rtd-theme==0.4.3 -terminaltables==3.1.0 -tox==3.23.0 -vcrpy==1.13.0 -virtualenv==20.13.0 -pytest-xdist==1.22.2 -pytest-forked==1.0.2 -PyYAML>=5.4,<6 -docutils==0.15.2 -prompt-toolkit==3.0.29 +sphinx>=3.3.0 +sphinx-rtd-theme>=0.4.3 +terminaltables>=3.1.0 +tox>=3.23.0 +vcrpy>=1.13.0 +virtualenv>=20.13.0 +pytest-xdist>=1.22.2 +pytest-forked>=1.0.2 +PyYAML>=5.4 +docutils>=0.15.2 +prompt-toolkit>=3.0.29 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.1', + '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', + 'click>=7.1.2', + 'cryptography>=3.2.1', + 'jmespath>=0.10.0', + 'python-dateutil>=2.5.3', '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' + 'terminaltables>=3.1.0', + 'pyOpenSSL>=17.5.0', + 'PyYAML>=5.4', + 'prompt-toolkit>=3.0.29' ] extras = { - 'db': ['cx_Oracle==8.3'] + 'db': ['cx_Oracle>=8.3'] } 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" + ] +)