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
56
57
|
diff -rupN oci-cli-2.5.8/setup.py oci-cli-2.5.8b/setup.py
--- oci-cli-2.5.8/setup.py 2019-04-16 15:43:28.000000000 -0400
+++ oci-cli-2.5.8b/setup.py 2019-05-01 21:06:00.741767895 -0400
@@ -29,26 +29,25 @@ with open_relative("README.rst") as f:
readme = f.read()
requires = [
- 'oci==2.2.7',
- 'arrow==0.10.0',
+ 'oci',
+ 'arrow',
'certifi',
- 'click==6.7',
- 'configparser==3.5.0',
- 'cryptography==2.4.2',
- 'httpsig_cffi==15.0.0',
- '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',
+ 'cryptography',
+ 'httpsig_cffi',
+ '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.5.8/src/oci_cli/cli_root.py oci-cli-2.5.8b/src/oci_cli/cli_root.py
--- oci-cli-2.5.8/src/oci_cli/cli_root.py 2019-04-16 15:43:28.000000000 -0400
+++ oci-cli-2.5.8b/src/oci_cli/cli_root.py 2019-05-01 21:06:48.868311967 -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.')
|