Merge pull request #56871 from s0undt3ch/hotfix/requirements

Update requirements. We no longer support Python 2.
This commit is contained in:
Daniel Wozniak 2020-04-23 23:07:22 -07:00 committed by GitHub
commit 12c70d2196
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 8 deletions

View file

@ -1,13 +1,11 @@
apache-libcloud==2.4.0
backports.ssl_match_hostname==3.7.0.1
backports-abc==0.5; python_version < '3.0'
certifi
cffi==1.12.2
CherryPy==17.4.1
click==7.0
cryptography==2.6.1
enum34==1.1.6
futures==3.2.0 ; python_version < "3.0"
gitpython==2.1.15
idna==2.8
ipaddress==1.0.22

View file

@ -4,14 +4,12 @@ salt for Windows with their corresponding licenses:
| Module | License |
|-----------|---------|
| backports-abc | --- |
| backports.ssl-match-hostname | PSF |
| certifi | ISC |
| cffi | MIT |
| CherryPy | BSD |
| cryptography | BSD |
| enum34 | BSD |
| futures | BSD |
| gitdb | BSD |
| GitPython | BSD |
| idna | BSD-like |

View file

@ -1,12 +1,10 @@
-r req_win.txt
backports-abc==0.5; python_version < '3.0'
backports.ssl-match-hostname==3.7.0.1; python_version < '3.7'
certifi
cffi==1.12.2
CherryPy==17.4.1
cryptography==2.6.1
enum34==1.1.6; python_version < '3.4'
futures==3.2.0; python_version < "3.0"
idna==2.8
ioloop==0.1a0
ipaddress==1.0.22

View file

@ -4,7 +4,5 @@ PyYAML
MarkupSafe
requests>=1.0.0
# Requirements for Tornado 4.5.3 (vendored as salt.ext.tornado)
backports-abc==0.5; python_version < '3.0'
singledispatch==3.4.0.3; python_version < '3.4'
# Required by Tornado to handle threads stuff.
futures>=2.0; python_version < '3.0'