Skip to content

Conversation

@klytje
Copy link
Contributor

@klytje klytje commented Jul 28, 2025

Description

libausaxs should now be present and included in the installers.

Fixes #3545, needed for #3544

How Has This Been Tested?

The Linux installer has been tested and verified to now include libausaxs. The issue was that libausaxs was previously only being downloaded for test builds, but not for the installers, which were therefore created without it. As functionality was already verified in #2882 and tests are still passing (including the libausaxs test), I don't think we have to do anything further here.

Review Checklist:

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

  • This will affect the installers, so
    • Linux installer (GH artifact) has been tested (worked)
    • Windows installer (GH artifact) has been tested (installed and worked)
    • MacOSX installer (GH artifact) has been tested (installed and worked)
    • Wheels installer (GH artifact) has been tested (installed and worked)

Licensing (untick if necessary)

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

@klytje klytje marked this pull request as ready for review July 28, 2025 20:20
Copy link
Contributor

@krzywon krzywon left a comment

Choose a reason for hiding this comment

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

For cleanliness, I would suggest this be a separate step in the CI file, not as part of the pip install.

      - name: Fetch AUSAXS C library
        run: |
          python build_tools/get_external_dependencies.py

@jamescrake-merani
Copy link
Contributor

My view is that this should get merged for 6.1.1, but in the long-term its not an ideal solution. Ideally, this should be packaged in PyPi.

I will try to see if I get some time to try this out before my contract ends, but I can't promise anything.

@klytje
Copy link
Contributor Author

klytje commented Jul 30, 2025

@jamescrake-merani Yes I agree. This PR is only for restoring functionality. Changing to pypi can be done in a future PR. I've started looking at creating a proper python wrapper for libausaxs link, though it won't be done anytime soon.

@klytje
Copy link
Contributor Author

klytje commented Jul 30, 2025

@krzywon

For cleanliness, I would suggest this be a separate step in the CI file, not as part of the pip install.

      - name: Fetch AUSAXS C library
        run: |
          python build_tools/get_external_dependencies.py

Fixed.

Copy link
Contributor

@krzywon krzywon left a comment

Choose a reason for hiding this comment

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

As noted by @jamescrake-merani, this is a reasonable short-term solution. Once this is on pypi, @klytje, please either let us know, or put in a pull request, that removes this step and adds ausaxs to our requirements file.

@krzywon krzywon merged commit 4eb4b89 into main Jul 30, 2025
32 checks passed
@krzywon krzywon deleted the fix_ausaxs_download branch July 30, 2025 12:56
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.

libausaxs is not included in installers

4 participants