Skip to content
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
26 changes: 26 additions & 0 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,32 @@ jobs:
if: matrix.TARGET == 'macos'
run: ./dist/${{ matrix.TARGET }}/${{ matrix.OUT_FILE_NAME }}/Contents/MacOS/${{ matrix.APP_BINARY_FILE_NAME }}

# -v checks the bundled version file. The login probe checks that requests/urllib3/certifi are bundled:
# a closed port must fail with a connection error, not an import error.
- name: Smoke test package for ${{matrix.TARGET}}
shell: bash
env:
TARGET: ${{ matrix.TARGET }}
OUT_FILE_NAME: ${{ matrix.OUT_FILE_NAME }}
APP_BINARY_FILE_NAME: ${{ matrix.APP_BINARY_FILE_NAME }}
run: |
case "$TARGET" in
macos) BIN="./dist/macos/$OUT_FILE_NAME/Contents/MacOS/$APP_BINARY_FILE_NAME" ;;
*) BIN="./dist/$TARGET/$OUT_FILE_NAME" ;;
esac
"$BIN" -v
if out=$("$BIN" login -s https://localhost:1 -u a -p b --no-certcheck 2>&1); then
echo "$out"
echo "login to a closed port unexpectedly succeeded"
exit 1
fi
echo "$out"
if echo "$out" | grep -Eq "ImportError|ModuleNotFoundError|Unhandled exception"; then
echo "packaged binary failed with an import error"
exit 1
fi
echo "$out" | grep -q "Max retries exceeded" || { echo "expected a connection error from requests"; exit 1; }

- name: Tar app bundle for Mac
if: matrix.TARGET == 'macos'
run: |
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ test = [
"types-setuptools"
]
localize = ["doit", "ftfy", "click"]
package = ["doit", "pyinstaller==5.13.1", "setuptools==81"]
package = ["doit", "pyinstaller==6.22.3", "setuptools==83.0.0"]
versioning = [
"doit",
"pyinstaller_versionfile",
Expand Down
2 changes: 1 addition & 1 deletion tabcmd-linux.spec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ a = Analysis(
pathex=[],
binaries=[],
datas=localized_strings,
hiddenimports=['tableauserverclient', 'requests.packages.urllib3', 'pkg_resources'],
hiddenimports=['tableauserverclient'],
hookspath=[],
hooksconfig={},
runtime_hooks=[],
Expand Down
2 changes: 1 addition & 1 deletion tabcmd-mac.spec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ a = Analysis(
pathex=[],
binaries=[],
datas=localized_strings,
hiddenimports=['tableauserverclient', 'requests.packages.urllib3', 'pkg_resources'],
hiddenimports=['tableauserverclient'],
hookspath=[],
hooksconfig={},
runtime_hooks=[],
Expand Down
2 changes: 1 addition & 1 deletion tabcmd-windows.spec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ a = Analysis(
pathex=[],
binaries=[],
datas=localized_strings,
hiddenimports=['tableauserverclient', 'requests.packages.urllib3', 'pkg_resources'],
hiddenimports=['tableauserverclient'],
hookspath=[],
hooksconfig={},
runtime_hooks=[],
Expand Down
Loading