Skip to content

Fix st2client PyPi install bug, add tests for it #4409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kami merged 10 commits into from
Oct 29, 2018
Merged

Fix st2client PyPi install bug, add tests for it #4409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
627569b
Add a Make target / test which verifies st2client installs and works
Kami Oct 23, 2018
4cd267a
Only run st2client install check on ci.
Kami Oct 23, 2018
9cb48d9
Use Python binary from venv dir.
Kami Oct 23, 2018
77e2f41
Fix path.
Kami Oct 23, 2018
0345e15
Also install libffi-dev on travis.
Kami Oct 23, 2018
12463ad
Add cryptography dependency to st2client in requirements.
Kami Oct 23, 2018
3fc39c9
Update .gitignore.
Kami Oct 23, 2018
7cfa50c
Re-generate requirement files.
Kami Oct 23, 2018
7087bd0
Merge branch 'master' into st2client_fix_and_install_check
Kami Oct 25, 2018
1dc7750
Merge branch 'master' into st2client_fix_and_install_check
Kami Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ develop-eggs
lib64
virtualenv
virtualenv-py3
virtualenv-osx
virtualenv-st2client
virtualenv-st2client-osx

# Installer logs
pip-log.txt
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ before_install:
- echo "deb [arch=amd64] http://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.4 multiverse" | sudo tee -a /etc/apt/sources.list
# Work around for Travis timeout issues, see https://github.com/travis-ci/travis-ci/issues/9112
- sudo apt-get update --option Acquire::Retries=100 --option Acquire::http::Timeout="60"
- sudo apt-get install mongodb-org-server mongodb-org-shell git -y
- sudo apt-get install mongodb-org-server mongodb-org-shell git libffi-dev -y
- pip install --upgrade "pip>=9.0,<9.1"
- sudo pip install --upgrade "virtualenv==15.1.0"

Expand Down
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ flake8: requirements .flake8
touch $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate
chmod +x $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate

$(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; python setup.py install
$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip>=9.0,<9.1"
$(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_DIR)/bin/python setup.py install ; cd ..
$(VIRTUALENV_ST2CLIENT_DIR)/bin/st2 --version
$(VIRTUALENV_ST2CLIENT_DIR)/bin/python -c "import st2client"

Expand Down Expand Up @@ -819,7 +820,7 @@ debs:
ci: ci-checks ci-unit ci-integration ci-mistral ci-packs-tests

.PHONY: ci-checks
ci-checks: compile .generated-files-check .pylint .flake8 .bandit .st2client-dependencies-check .st2common-circular-dependencies-check circle-lint-api-spec .rst-check
ci-checks: compile .generated-files-check .pylint .flake8 .bandit .st2client-dependencies-check .st2common-circular-dependencies-check circle-lint-api-spec .rst-check .st2client-install-check

.PHONY: ci-py3-unit
ci-py3-unit:
Expand Down
1 change: 1 addition & 0 deletions st2client/in-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ six
sseclient
python-editor
prompt-toolkit
cryptography
1 change: 1 addition & 0 deletions st2client/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Don't edit this file. It's generated automatically!
argcomplete
cryptography==2.3.1
jsonpath-rw==1.4.0
jsonschema==2.6.0
prettytable
Expand Down