Skip to content

Commit

Permalink
Merge pull request #55 from themaxbelov/fix-pip10
Browse files Browse the repository at this point in the history
Compatibility with pip10
  • Loading branch information
ToxicWar authored Apr 18, 2018
2 parents ea0e641 + 054571d commit 0463007
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ CentOS 7.2 provide outdated Python 2.7.5 release, so you'll need an additional s
pip install -U apsconnectcli
```

If you get an error message mentioning `invalid environment marker` upgrade the `setuptools` package before installing apsconnect-cli:
```
pip install -U apsconnectcli
```

### How to setup a kubernetes cluster
[Read a good step-by-step instruction by JetStack team](https://github.com/jetstack/kube-lego/tree/master/examples/nginx)

Expand Down Expand Up @@ -100,7 +105,7 @@ Connector backend - https://xxx
```
apsconnect install-frontend --source SOURCE --oauth-key OAUTH_KEY --oauth-secret OAUTH_SECRET \
--backend-url BACKEND_URL [--settings-file SETTINGS_FILE] \
[--network = public ] [--hub-id HUB_ID]
[--network = proxy ] [--hub-id HUB_ID]
```
```
⇒ apsconnect install-frontend package.aps.zip application-3-v1-687fd3e99eb 639a0c2bf3ab461aaf74a5c622d1fa34 --backend-url http://127.197.49.26/
Expand All @@ -112,7 +117,6 @@ Service template "connector" created with id=16 [ok]
Limits for Service template "16" are applied [ok]
```

_Note that `--network proxy` enables support of outbound proxy. [More details](https://doc.apsstandard.org/7.1/concepts/backend/connectors/proxy/#setting-external-application-instance)_
## Misc

#### Check utility version
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8.3
1.8.4
6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
import os
from os.path import abspath, dirname, join

from pip.req import parse_requirements
from setuptools import setup

try: # for pip >= 10
from pip._internal.req import parse_requirements
except ImportError: # for pip <= 9.0.3
from pip.req import parse_requirements

install_reqs = parse_requirements(os.path.join(os.path.dirname(os.path.abspath(__file__)),
'requirements.txt'), session='None')

Expand Down

0 comments on commit 0463007

Please sign in to comment.