Skip to content

Update for M1 #100

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update for M1 #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions build_python_framework
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

TOOLSDIR=$(dirname $0)
REQUIREMENTS="${TOOLSDIR}/py3_requirements.txt"
MACOS_VERSION=11.0 # use 10.9 for non-universal
MACOS_VERSION=10.9 # use 10.9 for non-universal, 11.0 for universal
PYTHON_BIN_VERSION=3.9
PYTHON_VERSION=3.9.1
PYTHON_PRERELEASE_VERSION=
Expand Down Expand Up @@ -76,7 +76,6 @@ if [[ "${XCODE_SELECT}" != "/Applications/Xcode.app/Contents/Developer" ]]; then
echo "Building the universal python framework may result in errors due to Xcode not being installed"
fi
"${PYTHONTOOLDIR}/make_relocatable_python_framework.py" \
--baseurl "${PYTHON_BASEURL}" \
--python-version "${PYTHON_VERSION}" \
--os-version "${MACOS_VERSION}" \
--pip-requirements "${REQUIREMENTS}" \
Expand Down
2 changes: 1 addition & 1 deletion generatejson.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def main():
help='Base URL to where root dir is hosted')
parser.add_argument('--output', default=None, action='store',
help='Required: Output directory to save json')
parser.add_argument('--item', default=None, action='append', nargs=6,
parser.add_argument('--item', default=None, action='append', nargs=7,
metavar=(
'item-name', 'item-path', 'item-stage',
'item-type', 'item-url', 'script-do-not-wait',
Expand Down
2 changes: 0 additions & 2 deletions py3_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
cffi==1.14.4
--no-binary cffi
pycparser==2.20
pyobjc==7.0.1
xattr==0.9.7
--no-binary xattr