Version bump

1 files changed, 26 insertions, 8 deletions

diff --git a/oci-cli.patch b/oci-cli.patch
index 98f8f9826bfd..4fce26150e92 100644
--- a/oci-cli.patch
+++ b/oci-cli.patch
@@ -1,18 +1,19 @@
-diff -rupN oci-cli-2.4.33/setup.py oci-cli-2.4.33b/setup.py
---- oci-cli-2.4.33/setup.py	2018-09-27 16:18:40.000000000 -0400
-+++ oci-cli-2.4.33b/setup.py	2018-09-30 14:14:19.094669289 -0400
-@@ -28,20 +28,19 @@ with open_relative("README.rst") as f:
+diff -rupN oci-cli-2.5.3/setup.py oci-cli-2.5.3b/setup.py
+--- oci-cli-2.5.3/setup.py	2019-03-12 14:02:50.000000000 -0400
++++ oci-cli-2.5.3b/setup.py	2019-03-15 23:21:14.762363410 -0400
+@@ -29,23 +29,22 @@ with open_relative("README.rst") as f:
      readme = f.read()
  
  requires = [
--    'oci==2.0.4',
+-    'oci==2.2.2',
 -    'arrow==0.10.0',
 +    'oci',
 +    'arrow',
      'certifi',
 -    'click==6.7',
 -    'configparser==3.5.0',
--    'cryptography==2.1.3',
+-    'cryptography==2.4.2',
+-    'cx_Oracle==7.0',
 -    'httpsig_cffi==15.0.0',
 -    'jmespath==0.9.3',
 -    'python-dateutil==2.7.3',
@@ -20,9 +21,12 @@ diff -rupN oci-cli-2.4.33/setup.py oci-cli-2.4.33b/setup.py
 -    'retrying==1.3.3',
 -    'six==1.11.0',
 -    'terminaltables==3.1.0',
--    'idna>=2.5,<2.7'
+-    'idna>=2.5,<2.7',
+-    'pyOpenSSL==18.0.0',
+-    'PyYAML==3.13'
 +    'click',
 +    'cryptography',
++    'cx_Oracle',
 +    'httpsig_cffi',
 +    'jmespath',
 +    'python-dateutil',
@@ -30,7 +34,21 @@ diff -rupN oci-cli-2.4.33/setup.py oci-cli-2.4.33b/setup.py
 +    'retrying',
 +    'six',
 +    'terminaltables',
-+    'idna'
++    'idna',
++    'pyOpenSSL',
++    'PyYAML'
  ]
  
  fips_libcrypto_file = os.getenv("OCI_CLI_FIPS_LIBCRYPTO_FILE")
+diff -rupN oci-cli-2.5.3/src/oci_cli/cli_root.py oci-cli-2.5.3b/src/oci_cli/cli_root.py
+--- oci-cli-2.5.3/src/oci_cli/cli_root.py	2019-03-12 14:02:50.000000000 -0400
++++ oci-cli-2.5.3b/src/oci_cli/cli_root.py	2019-03-15 23:22:26.492727407 -0400
+@@ -197,7 +197,7 @@ For information on configuration, see ht
+ @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.')