remove py2 in macOS build script, fix python build using compiled openssl, move pyobjc back in to req.txt

This commit is contained in:
Wesley Whetstone 2020-06-09 10:06:09 -07:00 committed by Daniel Wozniak
parent e85eea8178
commit af280e9a38
8 changed files with 57 additions and 203 deletions

View file

@ -15,20 +15,20 @@
# - XCode Command Line Tools (xcode-select --install)
#
# Usage:
# This script can be passed 3 parameters
# This script can be passed 2 parameters
# $1 : <version> : the version of salt to build
# (a git tag, not a branch)
# (defaults to git-repo state)
# $2 : <pythin ver> : The version of Python to use in the
# build. Default is 2
# $3 : <package dir> : the staging area for the package
# $2 : <package dir> : the staging area for the package
# defaults to /tmp/salt_pkg
# $3 : <test mode> : (true) if this script should be run in test mode,
# this disable the longer compile time of python
#
# Example:
# The following will build Salt v2015.8.3 with Python 2 and
# The following will build Salt v3001 and
# stage all files in /tmp/custom_pkg:
#
# ./build.sh v2015.8.3 2 /tmp/custom_pkg
# ./build.sh v3001 /tmp/custom_pkg
#
############################################################################
@ -52,15 +52,9 @@ else
fi
if [ "$2" == "" ]; then
PYVER=2
else
PYVER=$2
fi
if [ "$3" == "" ]; then
PKGDIR=/tmp/salt_pkg
else
PKGDIR=$3
PKGDIR=$2
fi
############################################################################
@ -68,11 +62,7 @@ fi
############################################################################
SRCDIR=`git rev-parse --show-toplevel`
PKGRESOURCES=$SRCDIR/pkg/osx
if [ "$PYVER" == "2" ]; then
PYTHON=/opt/salt/bin/python
else
PYTHON=/opt/salt/bin/python3
fi
PYTHON=/opt/salt/bin/python3
CPUARCH=`uname -m`
############################################################################
@ -89,8 +79,11 @@ fi
# Create the Build Environment
############################################################################
echo -n -e "\033]0;Build: Build Environment\007"
$PKGRESOURCES/build_env.sh $PYVER
$PKGRESOURCES/build_env.sh
if [[ "$?" != "0" ]]; then
echo "Failed to build the environment."
exit -1
fi
############################################################################
# Install Salt
############################################################################
@ -104,9 +97,9 @@ $PYTHON $SRCDIR/setup.py install
# Build Package
############################################################################
echo -n -e "\033]0;Build: Package Salt\007"
$PKGRESOURCES/build_pkg.sh $VERSION $PYVER $PKGDIR
$PKGRESOURCES/build_pkg.sh $VERSION $PKGDIR
############################################################################
# Sign Package
############################################################################
$PKGRESOURCES/build_sig.sh salt-$VERSION-py$PYVER-$CPUARCH.pkg salt-$VERSION-py$PYVER-$CPUARCH-signed.pkg
$PKGRESOURCES/build_sig.sh salt-$VERSION-py3-$CPUARCH.pkg salt-$VERSION-py3-$CPUARCH-signed.pkg

View file

@ -42,39 +42,40 @@ quit_on_error() {
exit -1
}
############################################################################
# Check passed parameters, set defaults
############################################################################
if [ "$1" == "" ]; then
PYVER=2
else
PYVER=$1
fi
############################################################################
# Parameters Required for the script to function properly
############################################################################
echo -n -e "\033]0;Build_Env: Variables\007"
# This is needed to allow the some test suites (zmq) to pass
ulimit -n 1200
# taken from https://github.com/zeromq/libzmq/issues/1878
SET_ULIMIT=200000
sysctl -w kern.maxfiles=$SET_ULIMIT
sysctl -w kern.maxfilesperproc=$SET_ULIMIT
launchctl limit maxfiles $SET_ULIMIT $SET_ULIMIT
ulimit -n $SET_ULIMIT
CHECK_ULIMIT=`ulimit -n`
if [[ "$SET_ULIMIT" != "$CHECK_ULIMIT" ]]; then
echo "Failed to set ulimit"
fi
SRCDIR=`git rev-parse --show-toplevel`
SCRIPTDIR=`pwd`
SHADIR=$SCRIPTDIR/shasums
INSTALL_DIR=/opt/salt
PKG_CONFIG=$INSTALL_DIR/bin/pkg-config
PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig
CFLAGS="-I$INSTALL_DIR/include"
LDFLAGS="-L$INSTALL_DIR/lib"
if [ "$PYVER" == "2" ]; then
PYDIR=$INSTALL_DIR/lib/python2.7
PYTHON=$INSTALL_DIR/bin/python
PIP=$INSTALL_DIR/bin/pip
else
PYDIR=$INSTALL_DIR/lib/python3.7
PYTHON=$INSTALL_DIR/bin/python3
PIP=$INSTALL_DIR/bin/pip3
fi
CFLAGS="-march=x86-64 -mtune=generic"
PYDIR=$INSTALL_DIR/lib/python3.7
PYTHON=$INSTALL_DIR/bin/python3
PIP=$INSTALL_DIR/bin/pip3
# needed for python to find pkg-config and have pkg-config properly link
# the python install to the compiled openssl below.
export PKG_CONFIG
export PKG_CONFIG_PATH
export CFLAGS
############################################################################
# Determine Which XCode is being used (XCode or XCode Command Line Tools)
@ -83,16 +84,14 @@ fi
# Fink, Brew)
# Check for Xcode Command Line Tools first
if [ -d '/Library/Developer/CommandLineTools/usr/bin' ]; then
PATH=/Library/Developer/CommandLineTools/usr/bin:$INSTALL_DIR/bin:$PATH
MAKE=/Library/Developer/CommandLineTools/usr/bin/make
elif [ -d '/Applications/Xcode.app/Contents/Developer/usr/bin' ]; then
PATH=/Applications/Xcode.app/Contents/Developer/usr/bin:$INSTALL_DIR/bin:$PATH
MAKE=/Applications/Xcode.app/Contents/Developer/usr/bin/make
else
echo "No installation of XCode found. This script requires XCode."
echo "Try running: xcode-select --install"
exit -1
fi
export PATH
############################################################################
# Download Function
@ -214,7 +213,7 @@ echo -n -e "\033]0;Build_Env: zeromq: configure\007"
echo -n -e "\033]0;Build_Env: zeromq: make\007"
$MAKE
echo -n -e "\033]0;Build_Env: zeromq: make check\007"
$MAKE check
#$MAKE check
echo -n -e "\033]0;Build_Env: zeromq: make install\007"
$MAKE install
@ -233,7 +232,7 @@ echo "Building OpenSSL"
echo "################################################################################"
cd $PKGDIR
echo -n -e "\033]0;Build_Env: OpenSSL: configure\007"
./Configure darwin64-x86_64-cc --prefix=$INSTALL_DIR --openssldir=$INSTALL_DIR/openssl
./Configure darwin64-x86_64-cc shared --prefix=$INSTALL_DIR --openssldir=$INSTALL_DIR/openssl
echo -n -e "\033]0;Build_Env: OpenSSL: make\007"
$MAKE
echo -n -e "\033]0;Build_Env: OpenSSL: make test\007"
@ -246,13 +245,8 @@ $MAKE install
############################################################################
echo -n -e "\033]0;Build_Env: Python: download\007"
if [ "$PYVER" == "2" ]; then
PKGURL="https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz"
PKGDIR="Python-2.7.15"
else
PKGURL="https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tar.xz"
PKGDIR="Python-3.7.4"
fi
PKGURL="https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tar.xz"
PKGDIR="Python-3.7.4"
download $PKGURL
@ -262,7 +256,8 @@ echo "##########################################################################
echo "Note there are some test failures"
cd $PKGDIR
echo -n -e "\033]0;Build_Env: Python: configure\007"
./configure --prefix=$INSTALL_DIR --enable-shared --enable-toolbox-glue --with-ensurepip=install
# removed --enable-toolbox-glue as no longer a config option
./configure --prefix=$INSTALL_DIR --enable-shared --with-ensurepip=install --enable-optimizations
echo -n -e "\033]0;Build_Env: Python: make\007"
$MAKE
echo -n -e "\033]0;Build_Env: Python: make install\007"
@ -283,7 +278,7 @@ cd $BUILDDIR
echo "################################################################################"
echo "Installing Salt Dependencies with pip (normal)"
echo "################################################################################"
$PIP install -r $SRCDIR/pkg/osx/req.txt -r $SRCDIR/pkg/osx/req_pyobjc.txt \
$PIP install -r $SRCDIR/pkg/osx/req.txt \
--target=$PYDIR/site-packages \
--ignore-installed \
--no-cache-dir

View file

@ -56,18 +56,11 @@ else
VERSION=$1
fi
# Get/Set Python Version
if [ "$2" == "" ]; then
PYVER=2
else
PYVER=$2
fi
# Get/Set temp directory
if [ "$3" == "" ]; then
if [ "$2" == "" ]; then
PKGDIR=/tmp/salt_pkg
else
PKGDIR=$3
PKGDIR=$2
fi
CPUARCH=`uname -m`
@ -132,11 +125,8 @@ rm -rdf $PKGDIR/opt/salt/lib/engines
rm -rdf $PKGDIR/opt/salt/share/aclocal
rm -rdf $PKGDIR/opt/salt/share/doc
rm -rdf $PKGDIR/opt/salt/share/man/man1/pkg-config.1
if [ "$PYVER" == "2" ]; then
rm -rdf $PKGDIR/opt/salt/lib/python2.7/test
else
rm -rdf $PKGDIR/opt/salt/lib/python3.7/test
fi
rm -rdf $PKGDIR/opt/salt/lib/python3.7/test
echo -n -e "\033]0;Build_Pkg: Remove compiled python files\007"
find $PKGDIR/opt/salt -name '*.pyc' -type f -delete
@ -155,23 +145,12 @@ cp $SRCDIR/conf/master $PKGDIR/etc/salt/master.dist
############################################################################
echo -n -e "\033]0;Build_Pkg: Add Version to .xml\007"
if [ "$PYVER" == "2" ]; then
TITLE="Salt $VERSION"
DESC="Salt $VERSION with Python 2"
SEDSTR="s/@PY2@/_py2/g"
else
TITLE="Salt $VERSION (Python 3)"
DESC="Salt $VERSION with Python 3"
SEDSTR="s/@PY2@//g"
fi
TITLE="Salt $VERSION (Python 3)"
DESC="Salt $VERSION with Python 3"
cd $PKGRESOURCES
cp distribution.xml.dist distribution.xml
# Select the appropriate welcome text
# This is only necessary until Sodium, then this can be removed
sed -E -i '' "$SEDSTR" distribution.xml
SEDSTR="s/@TITLE@/$TITLE/g"
sed -E -i '' "$SEDSTR" distribution.xml
@ -181,9 +160,6 @@ sed -E -i '' "$SEDSTR" distribution.xml
SEDSTR="s/@VERSION@/$VERSION/g"
sed -E -i '' "$SEDSTR" distribution.xml
SEDSTR="s/@PYVER@/$PYVER/g"
sed -E -i '' "$SEDSTR" distribution.xml
SEDSTR="s/@CPUARCH@/$CPUARCH/g"
sed -i '' "$SEDSTR" distribution.xml
@ -196,10 +172,10 @@ pkgbuild --root=$PKGDIR \
--scripts=pkg-scripts \
--identifier=com.saltstack.salt \
--version=$VERSION \
--ownership=recommended salt-src-$VERSION-py$PYVER-$CPUARCH.pkg
--ownership=recommended salt-src-$VERSION-py3-$CPUARCH.pkg
productbuild --resources=pkg-resources \
--distribution=distribution.xml \
--package-path=salt-src-$VERSION-py$PYVER-$CPUARCH.pkg \
--version=$VERSION salt-$VERSION-py$PYVER-$CPUARCH.pkg
--package-path=salt-src-$VERSION-py3-$CPUARCH.pkg \
--version=$VERSION salt-$VERSION-py3-$CPUARCH.pkg

View file

@ -17,7 +17,7 @@
scaling="proportional"
alignment="bottomleft" />
<!-- Define documents displayed at various steps -->
<welcome file="welcome@PY2@.rtf"
<welcome file="welcome.rtf"
mime-type="text/rtf" />
<license file="license.rtf"
mime-type="text/rtf" />
@ -26,7 +26,7 @@
<!-- List all component packages -->
<pkg-ref id="com.saltstack.salt"
version="@VERSION@"
auth="root">salt-src-@VERSION@-py@PYVER@-@CPUARCH@.pkg</pkg-ref>
auth="root">salt-src-@VERSION@-py3-@CPUARCH@.pkg</pkg-ref>
<!-- List them again here. They can now be organized
as a hierarchy if you want. -->
<choices-outline>

View file

@ -18,6 +18,7 @@ psutil==5.6.6
pyasn1==0.4.8
pycparser==2.19
pycryptodomex==3.9.7
pyobjc==6.2
pyopenssl==19.0.0
python-dateutil==2.8.0
python-gnupg==0.4.4

View file

@ -1,6 +0,0 @@
# To properly generate the pyobjc dependency tree, run, on a mac, the following
# pip install pip-tools
# pip-compile --output-file=pkg/osx/req_pyobjc.txt pkg/osx/req_pyobjc.in
#
# Should only be necessary when changing the pyobjc version bellow
pyobjc==5.1.2

View file

@ -1,104 +0,0 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=pkg/osx/req_pyobjc.txt pkg/osx/req_pyobjc.in
#
pyobjc-core==5.1.2 # via pyobjc, pyobjc-framework-accounts, pyobjc-framework-addressbook, pyobjc-framework-adsupport, pyobjc-framework-applescriptkit, pyobjc-framework-applescriptobjc, pyobjc-framework-applicationservices, pyobjc-framework-automator, pyobjc-framework-avfoundation, pyobjc-framework-avkit, pyobjc-framework-businesschat, pyobjc-framework-calendarstore, pyobjc-framework-cfnetwork, pyobjc-framework-cloudkit, pyobjc-framework-cocoa, pyobjc-framework-collaboration, pyobjc-framework-colorsync, pyobjc-framework-contacts, pyobjc-framework-contactsui, pyobjc-framework-coreaudio, pyobjc-framework-coreaudiokit, pyobjc-framework-corebluetooth, pyobjc-framework-coredata, pyobjc-framework-corelocation, pyobjc-framework-coremedia, pyobjc-framework-coremediaio, pyobjc-framework-coreml, pyobjc-framework-coreservices, pyobjc-framework-corespotlight, pyobjc-framework-coretext, pyobjc-framework-corewlan, pyobjc-framework-cryptotokenkit, pyobjc-framework-dictionaryservices, pyobjc-framework-discrecording, pyobjc-framework-discrecordingui, pyobjc-framework-diskarbitration, pyobjc-framework-dvdplayback, pyobjc-framework-eventkit, pyobjc-framework-exceptionhandling, pyobjc-framework-externalaccessory, pyobjc-framework-findersync, pyobjc-framework-fsevents, pyobjc-framework-gamecenter, pyobjc-framework-gamecontroller, pyobjc-framework-gamekit, pyobjc-framework-gameplaykit, pyobjc-framework-imagecapturecore, pyobjc-framework-imserviceplugin, pyobjc-framework-inputmethodkit, pyobjc-framework-installerplugins, pyobjc-framework-instantmessage, pyobjc-framework-intents, pyobjc-framework-iosurface, pyobjc-framework-ituneslibrary, pyobjc-framework-latentsemanticmapping, pyobjc-framework-launchservices, pyobjc-framework-libdispatch, pyobjc-framework-localauthentication, pyobjc-framework-mapkit, pyobjc-framework-mediaaccessibility, pyobjc-framework-medialibrary, pyobjc-framework-mediaplayer, pyobjc-framework-mediatoolbox, pyobjc-framework-modelio, pyobjc-framework-multipeerconnectivity, pyobjc-framework-naturallanguage, pyobjc-framework-netfs, pyobjc-framework-network, pyobjc-framework-networkextension, pyobjc-framework-notificationcenter, pyobjc-framework-opendirectory, pyobjc-framework-osakit, pyobjc-framework-photos, pyobjc-framework-photosui, pyobjc-framework-preferencepanes, pyobjc-framework-pubsub, pyobjc-framework-qtkit, pyobjc-framework-quartz, pyobjc-framework-safariservices, pyobjc-framework-scenekit, pyobjc-framework-screensaver, pyobjc-framework-scriptingbridge, pyobjc-framework-searchkit, pyobjc-framework-security, pyobjc-framework-securityfoundation, pyobjc-framework-securityinterface, pyobjc-framework-servicemanagement, pyobjc-framework-social, pyobjc-framework-spritekit, pyobjc-framework-storekit, pyobjc-framework-syncservices, pyobjc-framework-systemconfiguration, pyobjc-framework-usernotifications, pyobjc-framework-videosubscriberaccount, pyobjc-framework-videotoolbox, pyobjc-framework-vision, pyobjc-framework-webkit
pyobjc-framework-accounts==5.1.2 # via pyobjc, pyobjc-framework-cloudkit
pyobjc-framework-addressbook==5.1.2 # via pyobjc
pyobjc-framework-adsupport==5.1.2 # via pyobjc
pyobjc-framework-applescriptkit==5.1.2 # via pyobjc
pyobjc-framework-applescriptobjc==5.1.2 # via pyobjc
pyobjc-framework-applicationservices==5.1.2 # via pyobjc
pyobjc-framework-automator==5.1.2 # via pyobjc
pyobjc-framework-avfoundation==5.1.2 # via pyobjc, pyobjc-framework-mediaplayer
pyobjc-framework-avkit==5.1.2 # via pyobjc
pyobjc-framework-businesschat==5.1.2 # via pyobjc
pyobjc-framework-calendarstore==5.1.2 # via pyobjc
pyobjc-framework-cfnetwork==5.1.2 # via pyobjc
pyobjc-framework-cloudkit==5.1.2 # via pyobjc
pyobjc-framework-cocoa==5.1.2 # via pyobjc, pyobjc-framework-accounts, pyobjc-framework-addressbook, pyobjc-framework-adsupport, pyobjc-framework-applescriptkit, pyobjc-framework-applescriptobjc, pyobjc-framework-applicationservices, pyobjc-framework-automator, pyobjc-framework-avfoundation, pyobjc-framework-avkit, pyobjc-framework-businesschat, pyobjc-framework-calendarstore, pyobjc-framework-cfnetwork, pyobjc-framework-cloudkit, pyobjc-framework-collaboration, pyobjc-framework-colorsync, pyobjc-framework-contacts, pyobjc-framework-contactsui, pyobjc-framework-coreaudio, pyobjc-framework-coreaudiokit, pyobjc-framework-corebluetooth, pyobjc-framework-coredata, pyobjc-framework-corelocation, pyobjc-framework-coremedia, pyobjc-framework-coremediaio, pyobjc-framework-coreml, pyobjc-framework-corespotlight, pyobjc-framework-coretext, pyobjc-framework-corewlan, pyobjc-framework-cryptotokenkit, pyobjc-framework-discrecording, pyobjc-framework-discrecordingui, pyobjc-framework-diskarbitration, pyobjc-framework-dvdplayback, pyobjc-framework-eventkit, pyobjc-framework-exceptionhandling, pyobjc-framework-externalaccessory, pyobjc-framework-findersync, pyobjc-framework-fsevents, pyobjc-framework-gamecenter, pyobjc-framework-gamecontroller, pyobjc-framework-gamekit, pyobjc-framework-gameplaykit, pyobjc-framework-imagecapturecore, pyobjc-framework-imserviceplugin, pyobjc-framework-inputmethodkit, pyobjc-framework-installerplugins, pyobjc-framework-instantmessage, pyobjc-framework-intents, pyobjc-framework-iosurface, pyobjc-framework-ituneslibrary, pyobjc-framework-latentsemanticmapping, pyobjc-framework-localauthentication, pyobjc-framework-mapkit, pyobjc-framework-mediaaccessibility, pyobjc-framework-medialibrary, pyobjc-framework-mediatoolbox, pyobjc-framework-modelio, pyobjc-framework-multipeerconnectivity, pyobjc-framework-naturallanguage, pyobjc-framework-netfs, pyobjc-framework-network, pyobjc-framework-networkextension, pyobjc-framework-notificationcenter, pyobjc-framework-opendirectory, pyobjc-framework-osakit, pyobjc-framework-photos, pyobjc-framework-photosui, pyobjc-framework-preferencepanes, pyobjc-framework-pubsub, pyobjc-framework-qtkit, pyobjc-framework-quartz, pyobjc-framework-safariservices, pyobjc-framework-scenekit, pyobjc-framework-screensaver, pyobjc-framework-scriptingbridge, pyobjc-framework-security, pyobjc-framework-securityfoundation, pyobjc-framework-securityinterface, pyobjc-framework-servicemanagement, pyobjc-framework-social, pyobjc-framework-spritekit, pyobjc-framework-storekit, pyobjc-framework-syncservices, pyobjc-framework-systemconfiguration, pyobjc-framework-usernotifications, pyobjc-framework-videosubscriberaccount, pyobjc-framework-videotoolbox, pyobjc-framework-vision, pyobjc-framework-webkit
pyobjc-framework-collaboration==5.1.2 # via pyobjc
pyobjc-framework-colorsync==5.1.2 # via pyobjc
pyobjc-framework-contacts==5.1.2 # via pyobjc, pyobjc-framework-contactsui
pyobjc-framework-contactsui==5.1.2 # via pyobjc
pyobjc-framework-coreaudio==5.1.2 # via pyobjc, pyobjc-framework-coreaudiokit
pyobjc-framework-coreaudiokit==5.1.2 # via pyobjc
pyobjc-framework-corebluetooth==5.1.2 # via pyobjc
pyobjc-framework-coredata==5.1.2 # via pyobjc, pyobjc-framework-cloudkit, pyobjc-framework-syncservices
pyobjc-framework-corelocation==5.1.2 # via pyobjc, pyobjc-framework-cloudkit, pyobjc-framework-mapkit
pyobjc-framework-coremedia==5.1.2 # via pyobjc, pyobjc-framework-videotoolbox
pyobjc-framework-coremediaio==5.1.2 # via pyobjc
pyobjc-framework-coreml==5.1.2 # via pyobjc, pyobjc-framework-vision
pyobjc-framework-coreservices==5.1.2 # via pyobjc, pyobjc-framework-dictionaryservices, pyobjc-framework-launchservices, pyobjc-framework-searchkit
pyobjc-framework-corespotlight==5.1.2 # via pyobjc
pyobjc-framework-coretext==5.1.2 # via pyobjc
pyobjc-framework-corewlan==5.1.2 # via pyobjc
pyobjc-framework-cryptotokenkit==5.1.2 # via pyobjc
pyobjc-framework-dictionaryservices==5.1.2 # via pyobjc
pyobjc-framework-discrecording==5.1.2 # via pyobjc, pyobjc-framework-discrecordingui
pyobjc-framework-discrecordingui==5.1.2 # via pyobjc
pyobjc-framework-diskarbitration==5.1.2 # via pyobjc
pyobjc-framework-dvdplayback==5.1.2 # via pyobjc
pyobjc-framework-eventkit==5.1.2 # via pyobjc
pyobjc-framework-exceptionhandling==5.1.2 # via pyobjc
pyobjc-framework-externalaccessory==5.1.2 # via pyobjc
pyobjc-framework-findersync==5.1.2 # via pyobjc
pyobjc-framework-fsevents==5.1.2 # via pyobjc, pyobjc-framework-coreservices
pyobjc-framework-gamecenter==5.1.2 # via pyobjc
pyobjc-framework-gamecontroller==5.1.2 # via pyobjc
pyobjc-framework-gamekit==5.1.2 # via pyobjc
pyobjc-framework-gameplaykit==5.1.2 # via pyobjc
pyobjc-framework-imagecapturecore==5.1.2 # via pyobjc
pyobjc-framework-imserviceplugin==5.1.2 # via pyobjc
pyobjc-framework-inputmethodkit==5.1.2 # via pyobjc
pyobjc-framework-installerplugins==5.1.2 # via pyobjc
pyobjc-framework-instantmessage==5.1.2 # via pyobjc
pyobjc-framework-intents==5.1.2 # via pyobjc
pyobjc-framework-iosurface==5.1.2 # via pyobjc
pyobjc-framework-ituneslibrary==5.1.2 # via pyobjc
pyobjc-framework-latentsemanticmapping==5.1.2 # via pyobjc
pyobjc-framework-launchservices==5.1.2 # via pyobjc
pyobjc-framework-libdispatch==5.1.2 # via pyobjc
pyobjc-framework-localauthentication==5.1.2 # via pyobjc
pyobjc-framework-mapkit==5.1.2 # via pyobjc
pyobjc-framework-mediaaccessibility==5.1.2 # via pyobjc
pyobjc-framework-medialibrary==5.1.2 # via pyobjc
pyobjc-framework-mediaplayer==5.1.2 # via pyobjc
pyobjc-framework-mediatoolbox==5.1.2 # via pyobjc
pyobjc-framework-modelio==5.1.2 # via pyobjc
pyobjc-framework-multipeerconnectivity==5.1.2 # via pyobjc
pyobjc-framework-naturallanguage==5.1.2 # via pyobjc
pyobjc-framework-netfs==5.1.2 # via pyobjc
pyobjc-framework-network==5.1.2 # via pyobjc
pyobjc-framework-networkextension==5.1.2 # via pyobjc
pyobjc-framework-notificationcenter==5.1.2 # via pyobjc
pyobjc-framework-opendirectory==5.1.2 # via pyobjc
pyobjc-framework-osakit==5.1.2 # via pyobjc
pyobjc-framework-photos==5.1.2 # via pyobjc
pyobjc-framework-photosui==5.1.2 # via pyobjc
pyobjc-framework-preferencepanes==5.1.2 # via pyobjc
pyobjc-framework-pubsub==5.1.2 # via pyobjc
pyobjc-framework-qtkit==5.1.2 # via pyobjc
pyobjc-framework-quartz==5.1.2 # via pyobjc, pyobjc-framework-applicationservices, pyobjc-framework-avfoundation, pyobjc-framework-avkit, pyobjc-framework-coretext, pyobjc-framework-gamekit, pyobjc-framework-instantmessage, pyobjc-framework-mapkit, pyobjc-framework-medialibrary, pyobjc-framework-modelio, pyobjc-framework-qtkit, pyobjc-framework-scenekit, pyobjc-framework-spritekit, pyobjc-framework-videotoolbox, pyobjc-framework-vision
pyobjc-framework-safariservices==5.1.2 # via pyobjc
pyobjc-framework-scenekit==5.1.2 # via pyobjc
pyobjc-framework-screensaver==5.1.2 # via pyobjc
pyobjc-framework-scriptingbridge==5.1.2 # via pyobjc
pyobjc-framework-searchkit==5.1.2 # via pyobjc
pyobjc-framework-security==5.1.2 # via pyobjc, pyobjc-framework-securityfoundation, pyobjc-framework-securityinterface
pyobjc-framework-securityfoundation==5.1.2 # via pyobjc
pyobjc-framework-securityinterface==5.1.2 # via pyobjc
pyobjc-framework-servicemanagement==5.1.2 # via pyobjc
pyobjc-framework-social==5.1.2 # via pyobjc
pyobjc-framework-spritekit==5.1.2 # via pyobjc, pyobjc-framework-gameplaykit
pyobjc-framework-storekit==5.1.2 # via pyobjc
pyobjc-framework-syncservices==5.1.2 # via pyobjc
pyobjc-framework-systemconfiguration==5.1.2 # via pyobjc
pyobjc-framework-usernotifications==5.1.2 # via pyobjc
pyobjc-framework-videosubscriberaccount==5.1.2 # via pyobjc
pyobjc-framework-videotoolbox==5.1.2 # via pyobjc
pyobjc-framework-vision==5.1.2 # via pyobjc
pyobjc-framework-webkit==5.1.2 # via pyobjc
pyobjc==5.1.2

View file

@ -129,7 +129,6 @@ SALT_ZEROMQ_REQS = os.path.join(
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"),
]
SALT_WINDOWS_REQS = [
os.path.join(os.path.abspath(SETUP_DIRNAME), "pkg", "windows", "req.txt"),