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

Updated Pyinstaller and h5py #2276

Merged
merged 3 commits into from
Jul 16, 2024
Merged

Updated Pyinstaller and h5py #2276

merged 3 commits into from
Jul 16, 2024

Conversation

MikeSullivan7
Copy link
Collaborator

Issue

Closes #2269

Description

Pyinstaller has been upgraded to a newer version 6.7.0 -> 6.9.0 to help with issues around Pyinstaller dealing with issues related to setuptool imports. In order to avoid dependency clashes, h5py has also been upgraded from 3.6 -> 3.7.

Acceptance Criteria

Rebuild the dev environment with python setup.py create_dev_env and make sure that the environment builds correctly.
If you can, make a Windows build via instructions here: https://stfc365.sharepoint.com/:w:/r/sites/mantidimaging/_layouts/15/doc2.aspx?sourcedoc=%7Bad7f061e-d554-4734-b9ac-eafb29b3d43b%7D&action=edit&wdPid=7fdef645

python ./setup.py create_dev_env 
conda activate mantidimaging-dev 
cd packaging 
python PackageWithPyInstaller.py 

This would make an .exe file in the packaging folder, which should work as normal.

Documentation

Will add release note

@MikeSullivan7 MikeSullivan7 added Type: Improvement dependencies Pull requests that update a dependency file labels Jul 11, 2024
@MikeSullivan7 MikeSullivan7 self-assigned this Jul 11, 2024
@coveralls
Copy link

coveralls commented Jul 11, 2024

Coverage Status

coverage: 73.052%. remained the same
when pulling 0e88b26 on 2269_update_pyinstaller
into cb05980 on main.

@samtygier-stfc
Copy link
Collaborator

I am getting the following when i try to run the build on linux

Traceback (most recent call last):
  File "mantidimaging/__main__.py", line 16, in <module>
  File "PyInstaller/loader/pyimod02_importers.py", line 419, in exec_module
  File "mantidimaging/main.py", line 17, in <module>
  File "PyInstaller/loader/pyimod02_importers.py", line 419, in exec_module
  File "mantidimaging/core/__init__.py", line 5, in <module>
  File "PyInstaller/loader/pyimod02_importers.py", line 419, in exec_module
  File "mantidimaging/core/io/__init__.py", line 5, in <module>
  File "PyInstaller/loader/pyimod02_importers.py", line 419, in exec_module
  File "mantidimaging/core/io/saver.py", line 10, in <module>
  File "PyInstaller/loader/pyimod02_importers.py", line 419, in exec_module
  File "h5py/__init__.py", line 25, in <module>
ImportError: /home/sam/git/mantidimaging/packaging/dist/MantidImaging/_internal/libssl.so.3: version `OPENSSL_3.2.0' not found (required by /home/sam/git/mantidimaging/packaging/dist/MantidImaging/_internal/./libcurl.so.4)
[438263] Failed to execute script '__main__' due to unhandled exception!

@samtygier-stfc
Copy link
Collaborator

Looks like PackageWithPyInstaller.py needs these now

run_options.extend(add_conda_dynamic_libs('curl', 'ssl'))
run_options.extend(add_conda_dynamic_libs('curl', 'crypto'))

Copy link
Collaborator

@samtygier-stfc samtygier-stfc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested packaging and running on Linux. All looks good.

@samtygier-stfc samtygier-stfc added this pull request to the merge queue Jul 16, 2024
Merged via the queue into main with commit 97d051f Jul 16, 2024
8 checks passed
@samtygier-stfc samtygier-stfc deleted the 2269_update_pyinstaller branch July 16, 2024 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file Type: Improvement
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Update pyinstaller to 6.9
3 participants