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

Roll back changes, fix dependencies

Browse source
This commit is contained in:
twangboy 2020-03-23 13:49:01 -06:00
parent d2a5bd8add
commit 5851a5c2cd
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
4 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkg/osx/build_env.sh
View file

@ -271,7 +271,7 @@ $MAKE install
############################################################################
# upgrade pip
############################################################################
$PIP install --upgrade pip
$PIP install --upgrade pip wheel
############################################################################
# Download and install salt python dependencies
@ -286,26 +286,16 @@ echo "##########################################################################
$PIP install -r $SRCDIR/pkg/osx/req.txt \
--target=$PYDIR/site-packages \
--ignore-installed \
--no-cache-dir \
--upgrade
--no-cache-dir
echo "################################################################################"
echo "Installing PyOBJ C Dependencies with pip (normal)"
echo "Installing Salt Dependencies with pip (build_ext)"
echo "################################################################################"
$PIP install -r $SRCDIR/pkg/osx/req_pyobjc.txt \
--target=$PYDIR/site-packages \
$PIP install -r $SRCDIR/pkg/osx/req_ext.txt \
--global-option=build_ext \
--global-option="-I$INSTALL_DIR/include" \
--ignore-installed \
--no-cache-dir \
--upgrade
#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" \
# --ignore-installed \
# --no-cache-dir
--no-cache-dir
echo "--------------------------------------------------------------------------------"
echo "Create Symlink to certifi for openssl"

6
pkg/osx/req.txt
View file

@ -5,10 +5,10 @@ certifi
cffi==1.12.2
CherryPy==17.4.1
click==7.0
cryptography==2.8
cryptography==2.6.1
enum34==1.1.6
futures==3.2.0 ; python_version < "3.0"
gitpython==2.1.15
gitpython==2.1.11
idna==2.8
ipaddress==1.0.22
jinja2==2.10.1
@ -20,7 +20,7 @@ psutil==5.6.1
pyasn1==0.4.5
pycparser==2.19
pycryptodome==3.8.1
pyopenssl==19.1.0
pyobjc==5.1.2
python-dateutil==2.8.0
python-gnupg==0.4.4
pyyaml==5.1.2

7
pkg/osx/req_pyobjc.txt
View file

@ -1,7 +0,0 @@
pyobjc==5.3
pyobjc-framework-AdSupport==5.3
pyobjc-framework-BusinessChat==5.3
pyobjc-framework-NaturalLanguage==5.3
pyobjc-framework-Network==5.3
pyobjc-framework-UserNotifications==5.3
pyobjc-framework-VideoSubscriberAccount==5.3

2
setup.py
View file

@ -109,7 +109,7 @@ 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_pyobjc.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'),