saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update dependencies, remove req_ext.txt

Browse source
This commit is contained in:
Salt Admin 2020-03-19 11:59:11 -06:00
parent 249367b462
commit 461b198978
4 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/osx/build_env.sh
View file

@ -286,14 +286,6 @@ echo "##########################################################################
$PIP install -r $SRCDIR/pkg/osx/req.txt \
--no-cache-dir
echo "################################################################################"
echo "Installing Salt Dependencies with pip (build_ext)"
echo "################################################################################"
$PIP install -r $SRCDIR/pkg/osx/req_ext.txt \
--global-option=build_ext \
--global-option="-I$INSTALL_DIR/include" \
--no-cache-dir
echo "--------------------------------------------------------------------------------"
echo "Create Symlink to certifi for openssl"
echo "--------------------------------------------------------------------------------"

9
pkg/osx/req.txt
View file

@ -5,10 +5,10 @@ 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"
gitdb==0.6.4
gitpython==2.1.11
gitpython==2.1.15
idna==2.8
ipaddress==1.0.22
jinja2==2.10.1
@ -20,8 +20,8 @@ psutil==5.6.1
pyasn1==0.4.5
pycparser==2.19
pycryptodome==3.8.1
pyobjc==5.1.2
pyopenssl
pyobjc==5.3
pyopenssl==19.0.0
python-dateutil==2.8.0
python-gnupg==0.4.4
pyyaml==5.1.2
@ -29,6 +29,5 @@ pyzmq==18.0.1
requests==2.21.0
setproctitle
singledispatch==3.4.0.3; python_version < '3.4'
smmap==0.9.0
timelib==0.2.4
vultr==1.0.1

2
pkg/osx/req_ext.txt
View file

@ -1,2 +0,0 @@
cryptography==2.6.1
pyopenssl==19.0.0

1
setup.py
View file

@ -109,7 +109,6 @@ SALT_ZEROMQ_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'requirements',
SALT_LONG_DESCRIPTION_FILE = os.path.join(os.path.abspath(SETUP_DIRNAME), 'README.rst')
SALT_OSX_REQS = [
os.path.join(os.path.abspath(SETUP_DIRNAME), 'pkg', 'osx', 'req.txt'),
os.path.join(os.path.abspath(SETUP_DIRNAME), 'pkg', 'osx', 'req_ext.txt')
]
SALT_WINDOWS_REQS = [
os.path.join(os.path.abspath(SETUP_DIRNAME), 'pkg', 'windows', 'req.txt'),