Skip to content

Update pyyaml and flex contraints #4552

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 5 commits into from
Feb 18, 2019
Merged

Update pyyaml and flex contraints #4552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9df70b
Update requirements files with new PyYAML and flex version constraints
blag Feb 15, 2019
9a1c3ae
Add a checkrequirements make target and integrate it into Travis tests
blag Feb 15, 2019
dda7e88
Simplify some make logic
blag Feb 16, 2019
d29cd7b
Add missing entry for flex to fixed-requirements.txt, regenerate
Kami Feb 18, 2019
765764e
Merge branch 'master' into update-pyyaml-and-flex-contraints
Kami Feb 18, 2019
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
13 changes: 11 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ play:
@echo

.PHONY: check
check: requirements flake8 checklogs
check: check-requirements flake8 checklogs

# NOTE: We pass --no-deps to the script so we don't install all the
# package dependencies which are already installed as part of "requirements"
Expand All @@ -150,6 +150,15 @@ install-runners:
(. $(VIRTUALENV_DIR)/bin/activate; cd $$component; python setup.py develop --no-deps); \
done

.PHONY: check-requirements
check-requirements: requirements
@echo
@echo "============== CHECKING REQUIREMENTS =============="
@echo
# Update requirements and then make sure no files were changed
git status -- *requirements.txt */*requirements.txt | grep -q "nothing to commit"
@echo "All requirements files up-to-date!"

.PHONY: checklogs
checklogs:
@echo
Expand Down Expand Up @@ -849,7 +858,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 .st2client-dependencies-check .st2common-circular-dependencies-check circle-lint-api-spec .rst-check .st2client-install-check
ci-checks: compile .generated-files-check .pylint .flake8 check-requirements .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 fixed-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ tooz==1.63.1
zake==0.2.2
routes==2.4.1
webob==1.8.4
flex==6.14.0
prance==0.9.0
pywinrm==0.3.0
# test requirements below
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ argcomplete
bcrypt
cryptography==2.4.2
eventlet==0.24.1
flex>=6.13.2,<6.15.0
flex==6.14.0
git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper
git+https://github.com/StackStorm/orquesta.git@v0.4#egg=orquesta
git+https://github.com/StackStorm/python-mistralclient.git#egg=python-mistralclient
Expand Down Expand Up @@ -43,7 +43,7 @@ python-json-logger
python-statsd==2.1.0
pytz==2018.7
pywinrm==0.3.0
pyyaml>=4.2b4,<5.2
pyyaml<5.2,>=4.2b4
rednose
requests[security]<2.15,>=2.14.1
retrying==1.3.3
Expand Down
2 changes: 1 addition & 1 deletion scripts/travis/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fi
if [ ${TASK} == 'checks' ]; then
# compile .py files, useful as compatibility syntax check
make compile
make pylint flake8 bandit .st2client-dependencies-check .st2common-circular-dependencies-check
make pylint flake8 bandit checkrequirements .st2client-dependencies-check .st2common-circular-dependencies-check
elif [ ${TASK} == 'unit' ]; then
# compile .py files, useful as compatibility syntax check
make compile
Expand Down
2 changes: 1 addition & 1 deletion st2client/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ prompt-toolkit==1.0.15
python-dateutil==2.7.5
python-editor==1.0.3
pytz==2018.7
pyyaml>=4.2b4,<5.2
pyyaml<5.2,>=4.2b4
requests[security]<2.15,>=2.14.1
six==1.12.0
sseclient==0.0.19
4 changes: 2 additions & 2 deletions st2common/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ amqp==2.3.2
apscheduler==3.5.3
cryptography==2.4.2
eventlet==0.24.1
flex>=6.13.2,<6.15.0
flex==6.14.0
git+https://github.com/StackStorm/orquesta.git@v0.4#egg=orquesta
greenlet==0.4.15
ipaddr
Expand All @@ -18,7 +18,7 @@ paramiko==2.4.2
pymongo==3.7.2
python-dateutil==2.7.5
python-statsd==2.1.0
pyyaml>=4.2b4,<5.2
pyyaml<5.2,>=4.2b4
requests[security]<2.15,>=2.14.1
retrying==1.3.3
routes==2.4.1
Expand Down