Skip to content
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.

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

ci(appveyor): fix pyinstaller #4494

Merged
merged 3 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ build_script:
- cmd: |
echo "Building snapcraft.exe..."
venv\Scripts\activate.bat
pyinstaller.exe --copy-metadata lazr.restfulclient --onefile snapcraft.spec
pyinstaller.exe snapcraft.spec
venv\Scripts\deactivate.bat

echo "Test signing snapcraft.exe..."
Expand Down
2 changes: 1 addition & 1 deletion requirements-devel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,4 @@ zope.deprecation==5.0
zope.interface==6.1
python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz; sys.platform == "linux"
setuptools<66
pyinstaller==4.10; sys.platform == "win32"
pyinstaller==5.13.1; sys.platform == "win32"
2 changes: 1 addition & 1 deletion snapcraft_legacy/internal/dirs.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def _find_windows_data_dir(topdir):
# > c:\program files\python37\share\snapcraft

# Handle Option (a).
if topdir.startswith(site.USER_BASE):
if site.USER_BASE and topdir.startswith(site.USER_BASE):
data_dir = os.path.join(site.USER_BASE, "share", "snapcraft")
if os.path.exists(data_dir):
return data_dir
Expand Down
2 changes: 1 addition & 1 deletion tools/freeze-requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ requirements_fixups() {
# Pinned pyinstaller for windows.
if [[ "$req_file" == "requirements-devel.txt" ]]; then
sed -i '/pyinstaller/d' "$req_file"
echo 'pyinstaller==4.10; sys.platform == "win32"' >> "$req_file"
echo 'pyinstaller==5.13.1; sys.platform == "win32"' >> "$req_file"
fi
}

Expand Down