Skip to content
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

Pin PyOpenSSL<20 and prettytable<2 due to python2.7 conflicts #5131

Closed
wants to merge 3 commits into from
Closed

Pin PyOpenSSL<20 and prettytable<2 due to python2.7 conflicts #5131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
214bdb8
Pin PyOpenSSL<20 to avoid cryptography==2.8 conflict
cognifloyd Jan 29, 2021
2f2f2a8
Pin prettytable<2.0
cognifloyd Jan 29, 2021
97a0315
use v3.3 branch for circleci packaging workflow
cognifloyd Jan 29, 2021
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ jobs:
set -x
git clone ${ST2_PACKAGES_REPO} ~/st2-packages
cd ~/st2-packages
git checkout ${CIRCLE_BRANCH} || true
git checkout ${CIRCLE_BRANCH} || git checkout v3.3 || true
- run:
name: Initialize packages Build Environment
command: |
Expand Down
5 changes: 5 additions & 0 deletions fixed-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,14 @@ oslo.utils>=3.36.2,<=3.37.0
paramiko==2.7.1
passlib==1.7.1
prance==0.9.0
# prettytable 2.0 does not support python 2.7
prettytable<2.0
prompt-toolkit==1.0.15
pyinotify==0.9.6; platform_system=="Linux"
pymongo==3.10.0
# requests==2.23 needs pyOpenSSL>=0.14, but pyOpenSSL 20 (Nov 2020)
# requires cryptography>=3.2 which conflicts with our 2.8 requirement.
pyOpenSSL<20
python-editor==1.0.4
python-gnupg==0.4.5
python-keyczar==0.716
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ oslo.config<1.13,>=1.12.1
oslo.utils<=3.37.0,>=3.36.2
paramiko==2.7.1
passlib==1.7.1
prettytable
prettytable<2.0
prompt-toolkit==1.0.15
psutil==5.6.6
pyOpenSSL<20
pyinotify==0.9.6 ; platform_system == "Linux"
pymongo==3.10.0
pyrabbit
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 @@ -12,5 +12,6 @@ sseclient-py
python-editor
prompt-toolkit
cryptography
pyOpenSSL
more-itertools==5.0.0
zipp>=0.5,<=1.0.0
3 changes: 2 additions & 1 deletion st2client/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ cryptography==2.8
jsonpath-rw==1.4.0
jsonschema==2.6.0
more-itertools==5.0.0
prettytable
prettytable<2.0
prompt-toolkit==1.0.15
pyOpenSSL<20
python-dateutil==2.8.0
python-editor==1.0.4
pytz==2019.1
Expand Down
1 change: 1 addition & 0 deletions st2common/in-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ paramiko
pyyaml
pymongo
cryptography
pyOpenSSL
requests
retrying
semver
Expand Down
1 change: 1 addition & 0 deletions st2common/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ mongoengine==0.18.2
networkx==1.11
oslo.config<1.13,>=1.12.1
paramiko==2.7.1
pyOpenSSL<20
pymongo==3.10.0
python-dateutil==2.8.0
python-statsd==2.1.0
Expand Down