Skip to content

Remove most spkg-legacy-uninstall scripts#36839

Merged
vbraun merged 26 commits intosagemath:developfrom
mkoeppe:spkg-legacy-uninstall-remove
Dec 19, 2023
Merged

Remove most spkg-legacy-uninstall scripts#36839
vbraun merged 26 commits intosagemath:developfrom
mkoeppe:spkg-legacy-uninstall-remove

Conversation

@mkoeppe
Copy link
Copy Markdown
Contributor

@mkoeppe mkoeppe commented Dec 8, 2023 •
edited
Loading

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

orlitzky and others added 25 commits November 26, 2023 15:03
@orlitzky
build/bin: drop cygwin support
0b995ea 
These are pretty obvious: run "git grep -i cygwin build/bin" and then
delete the special cases for Cygwin.
don't need no rebase, no
ac7b464
no, no rebase - apart from git rebase
6bd341b
no CYGWIN-related studd from installation scrips and CI
002c984
more removals
8acab5a
remove easy cygwin things in build and tox.ini
df62048
remove cygwin stuff in src/, pkgs/, configure.ac
99099b0
remove outdated section in SPKG.rst
7861f3b
keep verbatim notice from Singular
7b45aaf
@mkoeppe
build/pkgs/iconv: Reduce to a dummy package
68c4600
@mkoeppe
src/sage/env.py: Remove commented-out cygwin code
1713eed
@mkoeppe
src/bin/sage-env: Restore lost setting of UNAME
128e348
@mkoeppe
src/sage/libs/singular/singular.pyx: Remove unused import
822a9f9
@mkoeppe
src/sage/interfaces/mathematica.py: Restore AUTHORS item
76aad01
@mkoeppe
build/bin/sage-bootstrap-python: Restore pwd checking - for WSL
52a657a
@mkoeppe
Merge remote-tracking branch 'upstream/develop' into no-cygwin-distro…
d9d8e14 
…-support
@mkoeppe
Merge tag '10.3.beta1' into no-cygwin-distro-support
989dde5 
SageMath version 10.3.beta1, Release Date: 2023-12-10
@embray @dimpase
Fix spkg-installs of packages with legacy uninstall commands; moving …
99796ad 
…those commands into spkg-legacy-uninstall scripts
@mkoeppe @dimpase
Remove redundant spkg-legacy-uninstall scripts
25ce68f
@mkoeppe @dimpase
Remove remaining redundant spkg-legacy-uninstall scripts
0772646
@mkoeppe @dimpase
build/pkgs/openblas: Move removal of pkgconfig symlinks to spkg-prein…
04c327f 
…st.in; fixes sagemath#30480
@mkoeppe @dimpase
build/pkgs/ipython/spkg-install.in: Remove legacy uninstall
be27325
@mkoeppe @dimpase
build/pkgs/cvxopt/spkg-install.in: Remove legacy uninstall of docs
cc2f2a1
@mkoeppe @dimpase
build/pkgs/frobby: Stage in DESTDIR, create spkg-legacy-uninstall
96b7196
@mkoeppe @dimpase
build/pkgs/sagetex/spkg-install.in: Remove legacy uninstall
77c6c04
@dimpase dimpase force-pushed the spkg-legacy-uninstall-remove branch from e42f181 to 77c6c04 Compare December 10, 2023 18:35
@dimpase
Copy link
Copy Markdown
Member

dimpase commented Dec 10, 2023

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

@github-actions
Copy link
Copy Markdown

github-actions bot commented Dec 10, 2023

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

@mkoeppe
Copy link
Copy Markdown
Contributor Author

mkoeppe commented Dec 10, 2023

Testing at

@dimpase
Copy link
Copy Markdown
Member

dimpase commented Dec 12, 2023 •
edited
Loading 

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
Copy Markdown
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
Copy Markdown
Member

tornaria commented Dec 12, 2023

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
Copy Markdown
Contributor Author

mkoeppe commented Dec 12, 2023

I think that's unrelated noise in the Conda CI

@mkoeppe
Copy link
Copy Markdown
Contributor Author

mkoeppe commented Dec 13, 2023

So let's get this in?

@dimpase
Copy link
Copy Markdown
Member

dimpase commented Dec 13, 2023

local tests seem OK.
lgtm

@dimpase
Copy link
Copy Markdown
Member

dimpase commented Dec 13, 2023

Is there a conflict with #36778 ?

@mkoeppe
Copy link
Copy Markdown
Contributor Author

mkoeppe commented Dec 13, 2023

#36778 is already merged here

@dimpase
Copy link
Copy Markdown
Member

dimpase commented Dec 13, 2023

ah, right

@mkoeppe
Copy link
Copy Markdown
Contributor Author

mkoeppe commented Dec 13, 2023

Thanks.

@vbraun vbraun merged commit 340cf1e into sagemath:develop Dec 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tornaria tornaria Awaiting requested review from tornaria

1 more reviewer

@dimpase dimpase dimpase approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@mkoeppe mkoeppe

Labels

c: build c: packages: standard t: refactoring

Projects

None yet

Milestone

sage-10.3

Development

Successfully merging this pull request may close these issues.

Follow-up to #30335: Don't modify $SAGE_LOCAL contents from spkg-install scripts Add spkg-legacy-uninstall scripts for most standard packages

6 participants

@mkoeppe @dimpase @tornaria @vbraun @orlitzky @embray