Skip to content

Commit

Permalink
gh-36779: Remove the pycygwin package
Browse files Browse the repository at this point in the history
    
It was only needed for Cygwin (to handle path conversions), and we're
dropping Cygwin support for real now.

Depends on #36769
    
URL: #36779
Reported by: Michael Orlitzky
Reviewer(s): Dima Pasechnik
  • Loading branch information
Release Manager committed Dec 17, 2023
2 parents cd27965 + 6193a16 commit f42ca66
Show file tree
Hide file tree
Showing 13 changed files with 1 addition and 59 deletions.
14 changes: 0 additions & 14 deletions build/pkgs/pycygwin/SPKG.rst

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/pycygwin/checksums.ini

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/pycygwin/dependencies

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/pycygwin/distros/repology.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/pycygwin/install-requires.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/pycygwin/package-version.txt

This file was deleted.

3 changes: 0 additions & 3 deletions build/pkgs/pycygwin/spkg-install.in

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/pycygwin/type

This file was deleted.

2 changes: 1 addition & 1 deletion build/pkgs/sagelib/dependencies
Original file line number Diff line number Diff line change
@@ -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) 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.
Expand Down
1 change: 0 additions & 1 deletion src/requirements.txt.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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)')

Expand Down
16 changes: 0 additions & 16 deletions src/sage/interfaces/jmoldata.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -129,8 +125,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.
Expand Down Expand Up @@ -180,10 +174,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
Expand All @@ -198,12 +188,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 "
Expand Down
5 changes: 0 additions & 5 deletions src/sage/plot/plot3d/base.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 0 additions & 7 deletions src/sage/repl/rich_output/backend_ipython.py
Original file line number Diff line number Diff line change
Expand Up @@ -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<script src="{0}"></script>'.format(script)


Expand Down

0 comments on commit f42ca66

Please sign in to comment.