From 74a41045119ba04b0ce4d07c2534c29237483f86 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 26 Nov 2023 09:49:28 -0500 Subject: [PATCH 1/8] build/pkgs/pycygwin: remove package --- build/pkgs/pycygwin/SPKG.rst | 14 -------------- build/pkgs/pycygwin/checksums.ini | 4 ---- build/pkgs/pycygwin/dependencies | 4 ---- build/pkgs/pycygwin/distros/repology.txt | 1 - build/pkgs/pycygwin/install-requires.txt | 1 - build/pkgs/pycygwin/package-version.txt | 1 - build/pkgs/pycygwin/spkg-install.in | 3 --- build/pkgs/pycygwin/type | 1 - 8 files changed, 29 deletions(-) delete mode 100644 build/pkgs/pycygwin/SPKG.rst delete mode 100644 build/pkgs/pycygwin/checksums.ini delete mode 100644 build/pkgs/pycygwin/dependencies delete mode 100644 build/pkgs/pycygwin/distros/repology.txt delete mode 100644 build/pkgs/pycygwin/install-requires.txt delete mode 100644 build/pkgs/pycygwin/package-version.txt delete mode 100644 build/pkgs/pycygwin/spkg-install.in delete mode 100644 build/pkgs/pycygwin/type diff --git a/build/pkgs/pycygwin/SPKG.rst b/build/pkgs/pycygwin/SPKG.rst deleted file mode 100644 index fdf67a08dc1..00000000000 --- a/build/pkgs/pycygwin/SPKG.rst +++ /dev/null @@ -1,14 +0,0 @@ -pycygwin: Python bindings for Cygwin's C API -============================================ - -Description ------------ - -Python bindings for Cygwin's C API. Provides some utilities to help with -the Cygwin port. Naturally, this package should only be installed on -Cygwin--for other platforms its installation is a no-op. - -Website -------- - -https://github.com/embray/PyCygwin diff --git a/build/pkgs/pycygwin/checksums.ini b/build/pkgs/pycygwin/checksums.ini deleted file mode 100644 index 7ce896982a4..00000000000 --- a/build/pkgs/pycygwin/checksums.ini +++ /dev/null @@ -1,4 +0,0 @@ -tarball=PyCygwin-VERSION.tar.gz -sha1=4021dbf77c353051761d277f5490b38a701ba51b -md5=12c30c847b144282178bc546d4e2cbcd -cksum=2254892419 diff --git a/build/pkgs/pycygwin/dependencies b/build/pkgs/pycygwin/dependencies deleted file mode 100644 index 1db13c07e43..00000000000 --- a/build/pkgs/pycygwin/dependencies +++ /dev/null @@ -1,4 +0,0 @@ - cython | $(PYTHON_TOOLCHAIN) $(PYTHON) - ----------- -All lines of this file are ignored except the first. diff --git a/build/pkgs/pycygwin/distros/repology.txt b/build/pkgs/pycygwin/distros/repology.txt deleted file mode 100644 index eeeab661dc6..00000000000 --- a/build/pkgs/pycygwin/distros/repology.txt +++ /dev/null @@ -1 +0,0 @@ -python:pycygwin diff --git a/build/pkgs/pycygwin/install-requires.txt b/build/pkgs/pycygwin/install-requires.txt deleted file mode 100644 index 3bec679b60b..00000000000 --- a/build/pkgs/pycygwin/install-requires.txt +++ /dev/null @@ -1 +0,0 @@ -pycygwin >=0.1 diff --git a/build/pkgs/pycygwin/package-version.txt b/build/pkgs/pycygwin/package-version.txt deleted file mode 100644 index 49d59571fbf..00000000000 --- a/build/pkgs/pycygwin/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -0.1 diff --git a/build/pkgs/pycygwin/spkg-install.in b/build/pkgs/pycygwin/spkg-install.in deleted file mode 100644 index eeb8dcdf62c..00000000000 --- a/build/pkgs/pycygwin/spkg-install.in +++ /dev/null @@ -1,3 +0,0 @@ -if [ "$UNAME" = "CYGWIN" ]; then - cd src && sdh_pip_install . -fi diff --git a/build/pkgs/pycygwin/type b/build/pkgs/pycygwin/type deleted file mode 100644 index a6a7b9cd726..00000000000 --- a/build/pkgs/pycygwin/type +++ /dev/null @@ -1 +0,0 @@ -standard From e284c1231af6b85803ac9419f1fe261100877302 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 26 Nov 2023 09:50:05 -0500 Subject: [PATCH 2/8] src/requirements.txt.m4: no longer require pycygwin --- src/requirements.txt.m4 | 1 - 1 file changed, 1 deletion(-) diff --git a/src/requirements.txt.m4 b/src/requirements.txt.m4 index 346ea3c6301..34c42860cf1 100644 --- a/src/requirements.txt.m4 +++ b/src/requirements.txt.m4 @@ -32,7 +32,6 @@ dnl ... already needed by sage.env pkgconfig==esyscmd(`printf $(sed "s/[.]p.*//;" ../pkgconfig/package-version.txt)') pplpy==esyscmd(`printf $(sed "s/[.]p.*//;" ../pplpy/package-version.txt)') primecountpy==esyscmd(`printf $(sed "s/[.]p.*//;" ../primecountpy/package-version.txt)') -pycygwin==esyscmd(`printf $(sed "s/[.]p.*//;" ../pycygwin/package-version.txt)'); sys_platform == 'cygwin' requests==esyscmd(`printf $(sed "s/[.]p.*//;" ../requests/package-version.txt)') typing_extensions==esyscmd(`printf $(sed "s/[.]p.*//;" ../typing_extensions/package-version.txt)') From ff0d06e071937aa4a9f6344d66ffd1a754640bc1 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 26 Nov 2023 09:50:17 -0500 Subject: [PATCH 3/8] build/pkgs/sagelib/dependencies: drop pycygwin --- build/pkgs/sagelib/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sagelib/dependencies b/build/pkgs/sagelib/dependencies index fa6e98df7db..64bdedbf9a1 100644 --- a/build/pkgs/sagelib/dependencies +++ b/build/pkgs/sagelib/dependencies @@ -1,4 +1,4 @@ -FORCE $(SCRIPTS) boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup $(PYTHON) pythran +FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup $(PYTHON) pythran ---------- All lines of this file are ignored except the first. From 3dbca812b32b7efcc8a038465997d88963d13754 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 26 Nov 2023 09:53:15 -0500 Subject: [PATCH 4/8] src/sage/interfaces/jmoldata.py: no native Windows paths We're dropping Cygwin support, and in particular, the pycygwin library that handles these paths. --- src/sage/interfaces/jmoldata.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/sage/interfaces/jmoldata.py b/src/sage/interfaces/jmoldata.py index 59a9a1e26a5..2039e433519 100644 --- a/src/sage/interfaces/jmoldata.py +++ b/src/sage/interfaces/jmoldata.py @@ -129,8 +129,6 @@ def export_image(self, - datafile -- full path to the data file Jmol can read or text of a script telling Jmol what to read or load. - If it is a script and the platform is cygwin, the filenames in - the script should be in native windows format. - datafile_cmd -- (default ``'script'``) ``'load'`` or ``'script'`` should be ``"load"`` for a data file. @@ -180,10 +178,6 @@ def export_image(self, sage: archive = NamedTemporaryFile(suffix=".zip") sage: D.export_jmol(archive.name) # needs sage.plot sage: archive_native = archive.name - sage: import sys - sage: if sys.platform == 'cygwin': - ....: import cygwin - ....: archive_native = cygwin.cygpath(archive_native, 'w') sage: script = f'set defaultdirectory "f{archive_native}"\n' sage: script += 'script SCRIPT\n' sage: with NamedTemporaryFile(suffix=".png") as testfile: # optional - java, needs sage.plot @@ -198,12 +192,6 @@ def export_image(self, jmolpath = self.jmolpath() target_native = targetfile - if sys.platform == 'cygwin': - import cygwin - target_native = cygwin.cygpath(target_native, 'w') - if datafile_cmd != 'script': - datafile = cygwin.cygpath(datafile, 'w') - launchscript = "" if (datafile_cmd != 'script'): launchscript = "load " From cdc7cb03381c6963b26d71b36e75ca39ffade667 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 26 Nov 2023 09:54:08 -0500 Subject: [PATCH 5/8] src/sage/plot/plot3d/base.pyx: no native Windows paths We're dropping Cygwin support, and in particular, the pycygwin library that handles these paths. --- src/sage/plot/plot3d/base.pyx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/sage/plot/plot3d/base.pyx b/src/sage/plot/plot3d/base.pyx index 7588cde2e27..8f69ed49725 100644 --- a/src/sage/plot/plot3d/base.pyx +++ b/src/sage/plot/plot3d/base.pyx @@ -285,13 +285,8 @@ cdef class Graphics3d(SageObject): tachyon.png.save_as(preview_png) else: # Java needs absolute paths - # On cygwin, they should be native ones scene_native = scene_zip - if sys.platform == 'cygwin': - import cygwin - scene_native = cygwin.cygpath(scene_native, 'w') - script = '''set defaultdirectory "{0}"\nscript SCRIPT\n'''.format(scene_native) jdata.export_image(targetfile=preview_png, datafile=script, image_type="PNG", From 91ca8c4458122965e2826079b1fe82ae000cb455 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 26 Nov 2023 09:54:24 -0500 Subject: [PATCH 6/8] src/sage/repl/rich_output/backend_ipython.py: no native Windows paths We're dropping Cygwin support, and in particular, the pycygwin library that handles these paths. --- src/sage/repl/rich_output/backend_ipython.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/sage/repl/rich_output/backend_ipython.py b/src/sage/repl/rich_output/backend_ipython.py index 10ccdc0c2c8..ba17b9244b4 100644 --- a/src/sage/repl/rich_output/backend_ipython.py +++ b/src/sage/repl/rich_output/backend_ipython.py @@ -419,13 +419,6 @@ def threejs_offline_scripts(self): script = os.path.join(THREEJS_DIR, '{}/three.min.js'.format(_required_threejs_version())) - if sys.platform == 'cygwin': - import cygwin - - def normpath(p): - return 'file:///' + cygwin.cygpath(p, 'w').replace('\\', '/') - script = normpath(script) - return '\n'.format(script) From d9460d36592f50de0bdbddca4edd4141d00222e6 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Thu, 14 Dec 2023 16:17:29 +0000 Subject: [PATCH 7/8] remove cygwin there too --- src/sage/interfaces/jmoldata.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/sage/interfaces/jmoldata.py b/src/sage/interfaces/jmoldata.py index 2039e433519..e7354e05c70 100644 --- a/src/sage/interfaces/jmoldata.py +++ b/src/sage/interfaces/jmoldata.py @@ -85,10 +85,6 @@ def jmolpath(self): """ jmolpath = os.path.join(JMOL_DIR, "JmolData.jar") - if sys.platform == 'cygwin': - import cygwin - jmolpath = cygwin.cygpath(jmolpath, 'w') - return jmolpath def is_jmol_available(self): From 6193a1607ed9107d2be08714b7b72e59a6205240 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Sat, 16 Dec 2023 21:40:18 +0000 Subject: [PATCH 8/8] removed 'arb' which popped up in deps --- build/pkgs/sagelib/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/sagelib/dependencies b/build/pkgs/sagelib/dependencies index 64bdedbf9a1..b1ebfd0825e 100644 --- a/build/pkgs/sagelib/dependencies +++ b/build/pkgs/sagelib/dependencies @@ -1,4 +1,4 @@ -FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup $(PYTHON) pythran +FORCE $(SCRIPTS) boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup $(PYTHON) pythran ---------- All lines of this file are ignored except the first.