Skip to content

Commit 5dde6fa

Browse files
Merge pull request #1527 from allmightyspiff/issues1524
Prevents SLCLI_VERSION environment variable from breaking things
2 parents ca1cad1 + 8c1677a commit 5dde6fa

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [published]
66

77
jobs:
8-
release:
8+
snap-release:
99
runs-on: ubuntu-18.04
1010
strategy:
1111
matrix:

README.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,26 @@ InsecurePlatformWarning Notice
7676
------------------------------
7777
This library relies on the `requests <http://docs.python-requests.org/>`_ library to make HTTP requests. On Python versions below Python 2.7.9, requests has started emitting a security warning (InsecurePlatformWarning) due to insecurities with creating SSL connections. To resolve this, upgrade to Python 2.7.9+ or follow the instructions here: http://stackoverflow.com/a/29099439.
7878

79+
Basic Usage
80+
-----------
81+
82+
- `The Complete Command Directory <https://softlayer-python.readthedocs.io/en/latest/cli_directory/>`_
83+
84+
Advanced Usage
85+
--------------
86+
87+
You can automatically set some parameters via environment variables with by using the SLCLI prefix. For example
88+
89+
.. code-block:: bash
90+
$ export SLCLI_VERBOSE=3
91+
$ export SLCLI_FORMAT=json
92+
$ slcli vs list
93+
94+
is equivalent to
95+
96+
.. code-block:: bash
97+
$ slcli -vvv --format=json vs list
98+
7999
Getting Help
80100
------------
81101
Bugs and feature requests about this library should have a `GitHub issue <https://github.com/softlayer/softlayer-python/issues>`_ opened about them.

SoftLayer/CLI/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def get_version_message(ctx, param, value):
129129
required=False,
130130
help="Use demo data instead of actually making API calls")
131131
@click.option('--version', is_flag=True, expose_value=False, is_eager=True, callback=get_version_message,
132-
help="Show version information.")
132+
help="Show version information.", allow_from_autoenv=False,)
133133
@environment.pass_env
134134
def cli(env,
135135
format='table',

0 commit comments

Comments
 (0)