Remove Cygwin distro support #36778

orlitzky · 2023-11-26T14:44:38Z

Removing Cygwin support from:

build system,
CI,
SPKG configuration and installation scripts,
Sage library.

Depends on #36779

mkoeppe · 2023-11-26T17:43:46Z

build/bin/sage-guess-package-system

@@ -30,12 +30,5 @@ elif xbps-install --version > /dev/null 2>&1; then
 elif pkg -v > /dev/null 2>&1; then
    echo freebsd
 else
-    case `uname -s` in
-        CYGWIN*)


I would like to keep build/bin/sage-guess-package-system, build/bin/sage-print-system-package-command, and the cygwin.txt files for a while longer.

All other removals and changes LGTM.

what's the point of keeping cygwin.txt ?

I don't know but there are 100 other things needed to remove cygwin so I don't really care if we save that for last. Feel free to revert that commit or rebase it away.

what's the point of keeping cygwin.txt ?

Because we have a nice little information system there, which I want to offer to other projects via #31662.

I don't know but there are 100 other things needed to remove cygwin so I don't really care if we save that for last. Feel free to revert that commit or rebase it away.

OK, I'll split this part out to a separate PR that I'll mark "pending".

That's now #36782.

I would like to keep build/bin/sage-guess-package-system, build/bin/sage-print-system-package-command, and the cygwin.txt files for a while longer.

For how much longer?

what's the point of keeping cygwin.txt ?

Because we have a nice little information system there, which I want to offer to other projects via #31662.

Cygwin was dragging down Sage - are you keen on offering this burden to other projects? :-)

These are pretty obvious: run "git grep -i cygwin build/bin" and then delete the special cases for Cygwin.

src/doc/en/installation/source.rst

build/pkgs/gf2x/SPKG.rst

build/bin/sage-bootstrap-python

COPYING.txt

dimpase · 2023-11-26T23:50:35Z

OK, this seems to be done; there are several Cygwin-related parts of patches left, but that's not urgent.

mkoeppe · 2023-11-26T23:59:28Z

@dimpase Your force-push undid my changes discussed above, please fix

dimpase · 2023-11-27T13:34:44Z

@dimpase Your force-push undid my changes discussed above, please fix

I'm not sure what I broke here, if anything.

mkoeppe · 2023-11-27T16:35:18Z

There's a handy "Compare" button next to your force push

tobiasdiez

Looks good to me like this.

In case the cygwin.txt turn out to be handy in the future, they can be easily restored from the git history.

mkoeppe · 2023-11-28T02:24:12Z

@dimpase Your force-push undid my changes discussed above, please fix

I'm not sure what I broke here, if anything.

Fixed it for you.

src/bin/sage-env

mkoeppe · 2023-11-28T02:38:00Z

src/sage/libs/singular/singular.pyx

@@ -1777,13 +1777,12 @@ cdef init_libsingular() noexcept:
        os.environ["SINGULAR_BIN_DIR"] = dirname(singular_executable)

    import platform


Suggested change

import platform

Fixed in 822a9f9

mkoeppe · 2023-11-28T02:38:49Z

src/sage/interfaces/mathematica.py

@@ -341,8 +341,6 @@

 - William Stein (2005): first version

- Doug Cutrell (2006-03-01): Instructions for use under Cygwin/Windows.
-


I think we don't want to remove credit for past authors.

Restored in 76aad01.

mkoeppe · 2023-11-28T02:40:19Z

src/sage/env.py

@@ -478,8 +469,8 @@ def uname_specific(name, value, alternative):
    aliases["ARB_LIBRARY"] = ARB_LIBRARY

    # TODO: Remove Cygwin hack by installing a suitable cblas.pc


Why not remove completely?

I don't know what's this all about. Is there a special hack in place which is only actually needed on Cygwin?

Not any more. Removed in 1713eed.

mkoeppe · 2023-11-29T01:58:24Z

Probably should be tested on (non-conda) macOS

orlitzky · 2023-11-29T02:44:20Z

I just re-read all of the changes. They all look relatively safe and everyone's comments have been addressed, so I'm going to set it to positive review. The sooner this gets merged the sooner I can start deleting the rest.

…-support

github-actions · 2023-12-06T05:04:39Z

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

vbraun · 2023-12-10T14:03:12Z

merge conflict

mkoeppe · 2023-12-10T17:33:08Z

I'll resolve the conflict

SageMath version 10.3.beta1, Release Date: 2023-12-10

@embray

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 sagemath#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 sagemath#25140 by @embray. We also switch `frobby` to `DESTDIR` staging and *add* an `spkg-legacy- uninstall` script. Resolves sagemath#25140. Resolves sagemath#30480.    ### 📝 Checklist     - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies  - Depends on sagemath#36778 (merged here to resolve merge conflict)  URL: sagemath#36839 Reported by: Matthias Köppe Reviewer(s): Dima Pasechnik

orlitzky requested review from dimpase and mkoeppe November 26, 2023 14:45

mkoeppe reviewed Nov 26, 2023

View reviewed changes

orlitzky and others added 4 commits November 26, 2023 15:03

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

mkoeppe force-pushed the no-cygwin-distro-support branch from c75c9bc to 002c984 Compare November 26, 2023 23:04

mkoeppe reviewed Nov 26, 2023

View reviewed changes

src/doc/en/installation/source.rst Outdated Show resolved Hide resolved

mkoeppe reviewed Nov 26, 2023

View reviewed changes

build/pkgs/gf2x/SPKG.rst Outdated Show resolved Hide resolved

mkoeppe reviewed Nov 26, 2023

View reviewed changes

build/bin/sage-bootstrap-python Outdated Show resolved Hide resolved

orlitzky commented Nov 26, 2023

View reviewed changes

COPYING.txt Outdated Show resolved Hide resolved

dimpase force-pushed the no-cygwin-distro-support branch from 002c984 to 6a9647e Compare November 26, 2023 23:38

dimpase approved these changes Nov 26, 2023

View reviewed changes

tobiasdiez approved these changes Nov 28, 2023

View reviewed changes

dimpase added 5 commits November 27, 2023 18:21

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 force-pushed the no-cygwin-distro-support branch from b8a8182 to 7b45aaf Compare November 28, 2023 02:23

mkoeppe reviewed Nov 28, 2023

View reviewed changes

src/bin/sage-env Show resolved Hide resolved

mkoeppe reviewed Nov 28, 2023

View reviewed changes

Matthias Koeppe added 4 commits November 28, 2023 09:37

src/bin/sage-env: Restore lost setting of UNAME

128e348

src/sage/libs/singular/singular.pyx: Remove unused import

822a9f9

src/sage/interfaces/mathematica.py: Restore AUTHORS item

76aad01

build/bin/sage-bootstrap-python: Restore pwd checking - for WSL

52a657a

mkoeppe added the c: build label Nov 29, 2023

mkoeppe assigned dimpase, orlitzky and mkoeppe Nov 29, 2023

mkoeppe added the s: needs review label Nov 29, 2023

mkoeppe approved these changes Nov 29, 2023

View reviewed changes

orlitzky added s: positive review and removed s: needs review labels Nov 29, 2023

Merge remote-tracking branch 'upstream/develop' into no-cygwin-distro…

d9d8e14

…-support

vbraun added the s: needs work label Dec 10, 2023

Merge tag '10.3.beta1' into no-cygwin-distro-support

989dde5

SageMath version 10.3.beta1, Release Date: 2023-12-10

mkoeppe added s: needs review s: positive review and removed s: positive review s: needs work s: needs review labels Dec 10, 2023

vbraun merged commit 1bbdb3e into sagemath:develop Dec 14, 2023
19 of 30 checks passed

mkoeppe added this to the sage-10.3 milestone Dec 14, 2023

github-actions bot removed the s: positive review label Dec 14, 2023

orlitzky deleted the no-cygwin-distro-support branch April 14, 2024 15:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove Cygwin distro support #36778

Remove Cygwin distro support #36778

orlitzky commented Nov 26, 2023 •

edited by mkoeppe

Loading

mkoeppe Nov 26, 2023

mkoeppe Nov 26, 2023

dimpase Nov 26, 2023

orlitzky Nov 26, 2023

mkoeppe Nov 26, 2023

mkoeppe Nov 26, 2023

mkoeppe Nov 26, 2023

tobiasdiez Nov 27, 2023

dimpase Nov 27, 2023

dimpase commented Nov 26, 2023

mkoeppe commented Nov 26, 2023 •

edited

Loading

dimpase commented Nov 27, 2023

mkoeppe commented Nov 27, 2023

tobiasdiez left a comment

mkoeppe commented Nov 28, 2023

mkoeppe Nov 28, 2023

mkoeppe Nov 28, 2023

mkoeppe Nov 28, 2023

mkoeppe Nov 28, 2023

mkoeppe Nov 28, 2023

dimpase Nov 28, 2023

mkoeppe Nov 28, 2023

mkoeppe commented Nov 29, 2023

orlitzky commented Nov 29, 2023

github-actions bot commented Dec 6, 2023

vbraun commented Dec 10, 2023

mkoeppe commented Dec 10, 2023 •

edited

Loading

		@@ -1777,13 +1777,12 @@ cdef init_libsingular() noexcept:
		os.environ["SINGULAR_BIN_DIR"] = dirname(singular_executable)

		import platform

		@@ -341,8 +341,6 @@

		- William Stein (2005): first version

		- Doug Cutrell (2006-03-01): Instructions for use under Cygwin/Windows.

		@@ -478,8 +469,8 @@ def uname_specific(name, value, alternative):
		aliases["ARB_LIBRARY"] = ARB_LIBRARY

		# TODO: Remove Cygwin hack by installing a suitable cblas.pc

Remove Cygwin distro support #36778

Remove Cygwin distro support #36778

Conversation

orlitzky commented Nov 26, 2023 • edited by mkoeppe Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dimpase commented Nov 26, 2023

mkoeppe commented Nov 26, 2023 • edited Loading

dimpase commented Nov 27, 2023

mkoeppe commented Nov 27, 2023

tobiasdiez left a comment

Choose a reason for hiding this comment

mkoeppe commented Nov 28, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mkoeppe commented Nov 29, 2023

orlitzky commented Nov 29, 2023

github-actions bot commented Dec 6, 2023

vbraun commented Dec 10, 2023

mkoeppe commented Dec 10, 2023 • edited Loading

orlitzky commented Nov 26, 2023 •

edited by mkoeppe

Loading

mkoeppe commented Nov 26, 2023 •

edited

Loading

mkoeppe commented Dec 10, 2023 •

edited

Loading