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
5 changes: 3 additions & 2 deletions .github/workflows/config.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"node": true
}
"node": true,
"pyinstaller": true
}
76 changes: 76 additions & 0 deletions opengeodeweb-viewer.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# -*- mode: python ; coding: utf-8 -*-
from PyInstaller.utils.hooks import collect_data_files
from PyInstaller.utils.hooks import collect_all

datas = []
binaries = []
hiddenimports = []
datas += collect_data_files('opengeodeweb_viewer')
tmp_ret = collect_all('vtkmodules')
datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]


a = Analysis(
['src/opengeodeweb_viewer/app.py'],
pathex=[],
binaries=binaries,
datas=datas,
hiddenimports=hiddenimports,
hookspath=[],
hooksconfig={},
runtime_hooks=[],
excludes=[],
noarchive=False,
optimize=0,
)

to_exclude = [
'opengl32',
'opengl32sw',
'libEGL',
'libGLESv2',
'libX11',
'libXext',
'libXrender',
'libXcursor',
'libXfixes',
'libXi',
'libXinerama',
'libXrandr',
'libXcomposite',
'libXdamage',
'libXxf86vm',
'libxcb',
'libxkbcommon',
'libwayland',
]
a.binaries = TOC([
entry for entry in a.binaries
if not any(
entry[0].lower().startswith(prefix.lower())
for prefix in to_exclude
)
])

pyz = PYZ(a.pure)

exe = EXE(
pyz,
a.scripts,
a.binaries,
a.datas,
[],
name='opengeodeweb-viewer',
debug=False,
bootloader_ignore_signals=False,
strip=False,
upx=True,
upx_exclude=[],
runtime_tmpdir=None,
console=True,
disable_windowed_traceback=False,
argv_emulation=False,
target_arch=None,
codesign_identity=None,
entitlements_file=None,
)
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ classifiers = [
"Bug Tracker" = "https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/issues"

[project.scripts]
opengeodeweb-viewer = "opengeodeweb_viewer.vtkw_server:run_server"
opengeodeweb-viewer = "opengeodeweb_viewer.app:run_server"

[tool.setuptools.dynamic]
dependencies = { file = ["requirements.txt"] }
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,3 @@ wslink==1.12.4
yarl>=1
# via aiohttp

opengeodeweb-microservice==1.*,>=1.0.15
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class Starter(ProcessStarter): # type: ignore
"opengeodeweb-viewer",
]

return "vtkw_server", Starter, ServerMonitor
return "app", Starter, ServerMonitor


ROOT_PATH = Path(__file__).parent.parent.absolute()
Expand Down