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

Remove most spkg-legacy-uninstall scripts #36839

Merged
merged 26 commits into from
Dec 19, 2023

Conversation

mkoeppe
Copy link
Contributor

@mkoeppe mkoeppe commented Dec 8, 2023

Most normal SPKGs are installed by staging in DESTDIR. When copying to the final install location in SAGE_LOCAL, an installation record is created, which is used later in package uninstallation.

However, when SPKG installation was switched to using staging in DESTDIR (Meta-ticket #24024), the parts of spkg-install scripts that used to be responsible for removing an old version of the installed package were either kept in place or moved to spkg-legacy-uninstall scripts. This was done to enable incremental builds from older installations.

By passage of time, this is no longer needed.

Some of the removals are a partial cherry-pick from #25140 by @embray.

We also switch frobby to DESTDIR staging and add an spkg-legacy-uninstall script.

Resolves #25140.
Resolves #30480.

📝 Checklist

  • The title is concise, informative, and self-explanatory.
  • The description explains in detail what this PR is about.
  • I have linked a relevant issue or discussion.
  • I have created tests covering the changes.
  • I have updated the documentation accordingly.

⌛ Dependencies

@dimpase dimpase force-pushed the spkg-legacy-uninstall-remove branch from e42f181 to 77c6c04 Compare December 10, 2023 18:35
@dimpase
Copy link
Member

dimpase commented Dec 10, 2023

this probably needs non-incremental testing, to see that all this pkg-config magic still works

Copy link

Documentation preview for this PR (built with commit 77c6c04; changes) is ready! 🎉

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Dec 10, 2023

@dimpase
Copy link
Member

dimpase commented Dec 12, 2023

sage -t --random-seed=35638309541997713729403828278151397505 src/sage_setup/clean.py
**********************************************************************
File "src/sage_setup/clean.py", line 104, in sage_setup.clean._find_stale_files
Failed example:
    for f in stale_iter:
        if f.endswith(skip_extensions): continue
        if '/ext_data/' in f: continue
        print('Found stale file: ' + f)
Expected nothing
Got:
    Found stale file: sage/tests/books/computational-mathematics-with-sagemath/graphtheory_doctest.py
    [...]
    Found stale file: sage/tests/books/judson-abstract-algebra/isomorph-sage.py
**********************************************************************
1 item had failures:
   1 of  15 in sage_setup.clean._find_stale_files
    [21 tests, 1 failure, 0.31 s]

is this something to happen once only, or a real bug?

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Dec 12, 2023

Where do you see this? In a local test or in one of the CI runs?

@tornaria
Copy link
Contributor

Where do you see this? In a local test or in one of the CI runs?

https://github.com/sagemath/sage/actions/runs/7171776285/job/19527492807?pr=36862

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Dec 12, 2023

I think that's unrelated noise in the Conda CI

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Dec 13, 2023

So let's get this in?

@dimpase
Copy link
Member

dimpase commented Dec 13, 2023

local tests seem OK.
lgtm

@dimpase
Copy link
Member

dimpase commented Dec 13, 2023

Is there a conflict with #36778 ?

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Dec 13, 2023

#36778 is already merged here

@dimpase
Copy link
Member

dimpase commented Dec 13, 2023

ah, right

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Dec 13, 2023

Thanks.

@vbraun vbraun merged commit 340cf1e into sagemath:develop Dec 19, 2023
15 of 43 checks passed
@mkoeppe mkoeppe added this to the sage-10.3 milestone Dec 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants