summarylogtreecommitdiffstats
path: root/oci-cli.patch
blob: be7034f9e46bde689986b9c4d35272b7fff378da (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
diff -rupN oci-cli-2.12.1/setup.py oci-cli-2.12.1b/setup.py
--- oci-cli-2.12.1/setup.py	2020-06-30 16:05:25.000000000 -0400
+++ oci-cli-2.12.1b/setup.py	2020-07-01 19:50:03.051625241 -0400
@@ -30,25 +30,24 @@ with open_relative("README.rst") as f:
     readme = f.read()
 
 requires = [
-    'oci==2.17.1',
-    'arrow==0.14.7',
+    'oci',
+    'arrow',
     'certifi',
-    'click==6.7',
-    'configparser==4.0.2',
-    'cryptography==2.8',
-    'jmespath==0.9.4',
-    'python-dateutil>=2.5.3,<3.0.0',
-    'pytz>=2016.10',
-    'retrying==1.3.3',
-    'six==1.14.0',
-    'terminaltables==3.1.0',
-    'idna>=2.5,<2.7',
-    'pyOpenSSL==18.0.0',
-    'PyYAML==5.1.2'
+    'click',
+    'cryptography',
+    'jmespath',
+    'python-dateutil',
+    'pytz',
+    'retrying',
+    'six',
+    'terminaltables',
+    'idna',
+    'pyOpenSSL',
+    'PyYAML'
 ]
 
 extras = {
-    'db': ['cx_Oracle==7.0']
+    'db': ['cx_Oracle']
 }
 
 fips_libcrypto_file = os.getenv("OCI_CLI_FIPS_LIBCRYPTO_FILE")
diff -rupN oci-cli-2.12.1/src/oci_cli/cli_root.py oci-cli-2.12.1b/src/oci_cli/cli_root.py
--- oci-cli-2.12.1/src/oci_cli/cli_root.py	2020-06-30 16:05:25.000000000 -0400
+++ oci-cli-2.12.1b/src/oci_cli/cli_root.py	2020-07-01 19:49:02.098353181 -0400
@@ -218,7 +218,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.')