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.

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

Update PyInstaller to 6.3 to fix missing imports in packaging #557

Merged
merged 12 commits into from
Jan 9, 2024
Merged

Update PyInstaller to 6.3 to fix missing imports in packaging #557

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b6c42f5
try collect all on h5py
CodyCBakerPhD Jan 8, 2024
289dd63
Update nwb-guide.spec
rly Jan 8, 2024
3300cfd
Update package.json
rly Jan 8, 2024
b5da734
Update nwb-guide.spec
rly Jan 8, 2024
0a86b3b
Update package.json
rly Jan 8, 2024
619e524
Update environment-Linux.yml
rly Jan 8, 2024
489d79d
Discard changes to nwb-guide.spec
rly Jan 8, 2024
5fe6055
Pin pyinstaller hooks
rly Jan 8, 2024
fef5def
Update environment-Linux.yml
rly Jan 9, 2024
f00859c
Update envs to use latest pyinstaller
rly Jan 9, 2024
f10536a
Revert adding h5py to spec file
rly Jan 9, 2024
be14c0f
Remove linux from dist test matrix
rly Jan 9, 2024
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
4 changes: 3 additions & 1 deletion environments/environment-Linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ channels:
- defaults
dependencies:
- python = 3.9.18
- PyInstaller = 5.13.0
- PyInstaller = 6.3.0
# pin pyinstaller hooks as temp fix for https://github.com/NeurodataWithoutBorders/nwb-guide/issues/559
# - pyinstaller-hooks-contrib = 2023.11
CodyCBakerPhD marked this conversation as resolved.
Show resolved Hide resolved
- nodejs = 18.16.1
- numcodecs = 0.11.0
# install these from conda-forge so that dependent packages get included in the distributable
Expand Down
2 changes: 2 additions & 0 deletions environments/environment-MAC-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ channels:
dependencies:
- python = 3.9.18
- PyInstaller = 5.13.0
# pin pyinstaller hooks as temp fix for https://github.com/NeurodataWithoutBorders/nwb-guide/issues/559
- pyinstaller-hooks-contrib = 2023.11
- nodejs = 18.16.1
- numcodecs = 0.11.0
- lxml = 4.9.3 # pypi build fails due to x64/arm64 mismatch so install from conda-forge
Expand Down
2 changes: 2 additions & 0 deletions environments/environment-MAC.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ channels:
dependencies:
- python = 3.9.18
- PyInstaller = 5.13.0
# pin pyinstaller hooks as temp fix for https://github.com/NeurodataWithoutBorders/nwb-guide/issues/559
- pyinstaller-hooks-contrib = 2023.11
- nodejs = 18.16.1
- numcodecs = 0.11.0
# install these from conda-forge so that dependent packages get included in the distributable
Expand Down
2 changes: 2 additions & 0 deletions environments/environment-Windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ dependencies:
- python = 3.9.17
- nodejs = 18.16.1
- PyInstaller = 5.13.0
# pin pyinstaller hooks as temp fix for https://github.com/NeurodataWithoutBorders/nwb-guide/issues/559
- pyinstaller-hooks-contrib = 2023.11
- pywin32 = 303
- git = 2.20.1
- setuptools = 58.0.4
Expand Down
2 changes: 2 additions & 0 deletions nwb-guide.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ binaries = []
hiddenimports = [ 'email_validator', *collect_submodules('scipy.special.cython_special'), *os.path.join(os.path.dirname(scipy.__file__), '.libs')]

datas += collect_data_files('jsonschema_specifications')
tmp_ret = collect_all('h5py')
datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
tmp_ret = collect_all('dandi')
datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
tmp_ret = collect_all('keyrings')
Expand Down
Loading