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

Cleanup of requirements.txt #2856

Merged
merged 2 commits into from
Apr 19, 2024
Merged

Cleanup of requirements.txt #2856

merged 2 commits into from
Apr 19, 2024

Conversation

krzywon
Copy link
Contributor

@krzywon krzywon commented Apr 18, 2024

Description

As noted in #2854, some packages are listed multiple times in requirements.txt. This removes those duplicates (sphinx and html5lib) and alphabetizes the list to eliminate the issue in the future.

Note - PySide6 is currently pinned, but that pinning is related to an issue with pyinstaller v6.0+. When #2854 is merged, this pin could potentially be removed (but not for v6.0.0...).

How Has This Been Tested?

Locally created a new python environment using the new file and was able to launch SasView.

Review Checklist:

[if using the editor, use [x] in place of [ ] to check a box]

Documentation (check at least one)

  • There is nothing that needs documenting
  • Documentation changes are in this PR
  • There is an issue open for the documentation (link?)

Installers

  • There is a chance this will affect the installers, if so
    • Windows installer (GH artifact) has been tested (installed and worked)
    • MacOSX installer (GH artifact) has been tested (installed and worked)

Licencing (untick if necessary)

  • The introduced changes comply with SasView license (BSD 3-Clause)

@butlerpd
Copy link
Member

I double checked that no requirements were lost (save duplicates) or added. All looks good. However, I cannot test the installer to make sure it is running due to the PyInstaller error. Thus I am merging 6.0 back into branch. Once complete we should test the Win and Mac installer before merging

Copy link
Member

@butlerpd butlerpd left a comment

Choose a reason for hiding this comment

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

it loads now and runs in Windows. There is a problem with the sector slicer but that is unlikely to be from this pull request. It would be good to get a Mac perspective as well.

Copy link
Contributor

@wpotrzebowski wpotrzebowski left a comment

Choose a reason for hiding this comment

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

Tested on Mac.

@butlerpd butlerpd merged commit a12755e into release_6.0.0 Apr 19, 2024
36 checks passed
@butlerpd butlerpd deleted the req-file-cleanup branch April 19, 2024 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants