diff --git a/programming/language/python3/python3/actions.py b/programming/language/python3/python3-idle/actions.py similarity index 57% rename from programming/language/python3/python3/actions.py rename to programming/language/python3/python3-idle/actions.py index 0437254710..9c821fc0d3 100644 --- a/programming/language/python3/python3/actions.py +++ b/programming/language/python3/python3-idle/actions.py @@ -14,15 +14,15 @@ def setup(): pisitools.dosed("Lib/cgi.py","^#.* /usr/local/bin/python","#!/usr/bin/python") shelltools.unlinkDir("Modules/expat") - shelltools.unlinkDir("Modules/zlib") + #shelltools.unlinkDir("Modules/zlib") shelltools.unlinkDir("Modules/_ctypes/darwin") - shelltools.unlinkDir("Modules/_ctypes/libffi") - shelltools.unlinkDir("Modules/_ctypes/libffi_msvc") + #shelltools.unlinkDir("Modules/_ctypes/libffi") + #shelltools.unlinkDir("Modules/_ctypes/libffi_msvc") shelltools.unlinkDir("Modules/_ctypes/libffi_osx") - shelltools.unlinkDir("Modules/_decimal/libmpdec") + #shelltools.unlinkDir("Modules/_decimal/libmpdec") autotools.rawConfigure("\ - --prefix=/usr \ + --prefix=/temp \ --enable-shared \ --with-threads \ --with-computed-gotos \ @@ -39,5 +39,15 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.remove("/usr/bin/2to3") - pisitools.dodoc("LICENSE", "README.*") + + shelltools.mkdir("%s/usr" % get.installDIR()) + + pisitools.domove("/temp/lib/python3*/tkinter", "/usr/lib/python3*/tkinter") + pisitools.domove("/temp/lib/python3*/lib-dynload/_tkinter.cpython-38m-x86_64-linux-gnu.so", "/usr/lib/python3*/lib-dynload/_tkinter.cpython-38m-x86_64-linux-gnu.so") + pisitools.domove("/temp/lib/python3.8/turtledemo", "/usr/lib/python3.8/turtledemo") + pisitools.domove("/temp/bin/idle3", "/usr/bin/idle3") + pisitools.domove("/temp/lib/python*/idlelib", "/usr/lib/python*/idlelib") + + pisitools.removeDir("/temp") + #pisitools.remove("/usr/bin/2to3") + #pisitools.dodoc("LICENSE", "README.*") diff --git a/programming/language/python3/python3-idle/files/0001-compileall-Fix-ddir-when-recursing.patch b/programming/language/python3/python3-idle/files/0001-compileall-Fix-ddir-when-recursing.patch new file mode 100644 index 0000000000..91ebc71f6a --- /dev/null +++ b/programming/language/python3/python3-idle/files/0001-compileall-Fix-ddir-when-recursing.patch @@ -0,0 +1,57 @@ +From 84fdbc156ed424d030686de350fbfc6c3593263f Mon Sep 17 00:00:00 2001 +Message-Id: <84fdbc156ed424d030686de350fbfc6c3593263f.1537028533.git.jan.steffens@gmail.com> +From: "Jan Alexander Steffens (heftig)" +Date: Sat, 15 Sep 2018 18:22:06 +0200 +Subject: [PATCH] compileall: Fix ddir when recursing + +--- + Lib/compileall.py | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/Lib/compileall.py b/Lib/compileall.py +index 72592126d7..70e246fd96 100644 +--- a/Lib/compileall.py ++++ b/Lib/compileall.py +@@ -45,12 +45,16 @@ def _walk_dir(dir, ddir=None, maxlevels=10, quiet=0): + else: + dfile = None + if not os.path.isdir(fullname): +- yield fullname ++ yield fullname, ddir + elif (maxlevels > 0 and name != os.curdir and name != os.pardir and + os.path.isdir(fullname) and not os.path.islink(fullname)): + yield from _walk_dir(fullname, ddir=dfile, + maxlevels=maxlevels - 1, quiet=quiet) + ++def _compile_one(file_ddir, *args, **kwargs): ++ file, ddir = file_ddir ++ return compile_file(file, ddir, *args, **kwargs) ++ + def compile_dir(dir, maxlevels=10, ddir=None, force=False, rx=None, + quiet=0, legacy=False, optimize=-1, workers=1, + invalidation_mode=py_compile.PycInvalidationMode.TIMESTAMP): +@@ -79,17 +83,17 @@ def compile_dir(dir, maxlevels=10, ddir=None, force=False, rx=None, + if workers is not None and workers != 1 and ProcessPoolExecutor is not None: + workers = workers or None + with ProcessPoolExecutor(max_workers=workers) as executor: +- results = executor.map(partial(compile_file, +- ddir=ddir, force=force, ++ results = executor.map(partial(_compile_one, ++ force=force, + rx=rx, quiet=quiet, + legacy=legacy, + optimize=optimize, + invalidation_mode=invalidation_mode), + files) + success = min(results, default=True) + else: +- for file in files: +- if not compile_file(file, ddir, force, rx, quiet, ++ for file_ddir in files: ++ if not _compile_one(file_ddir, force, rx, quiet, + legacy, optimize, invalidation_mode): + success = False + return success +-- +2.18.0 + diff --git a/programming/language/python3/python3/files/dont-make-libpython-readonly.patch b/programming/language/python3/python3-idle/files/dont-make-libpython-readonly.patch similarity index 100% rename from programming/language/python3/python3/files/dont-make-libpython-readonly.patch rename to programming/language/python3/python3-idle/files/dont-make-libpython-readonly.patch diff --git a/programming/language/python3/python3/files/idle.desktop b/programming/language/python3/python3-idle/files/idle.desktop similarity index 100% rename from programming/language/python3/python3/files/idle.desktop rename to programming/language/python3/python3-idle/files/idle.desktop diff --git a/programming/language/python3/python3/files/python-logo.png b/programming/language/python3/python3-idle/files/python-logo.png similarity index 100% rename from programming/language/python3/python3/files/python-logo.png rename to programming/language/python3/python3-idle/files/python-logo.png diff --git a/programming/language/python3/python3-idle/pspec.xml b/programming/language/python3/python3-idle/pspec.xml new file mode 100644 index 0000000000..0b2014c951 --- /dev/null +++ b/programming/language/python3/python3-idle/pspec.xml @@ -0,0 +1,86 @@ + + + + + python3-idle + http://www.python.org/ + + PisiLinux Community + admins@pisilinux.org + + custom + programming.language + An Integrated Development Environment for Python + An Integrated Development Environment for Python + https://www.python.org/ftp/python/3.8.0/Python-3.8.0.tar.xz + + + bzip2 + xz-devel + tcl-devel + gdbm-devel + zlib-devel + tcltk-devel + expat-devel + libffi-devel + sqlite-devel + ncurses-devel + openssl-devel + readline-devel + mpdecimal-devel + + + + 0001-compileall-Fix-ddir-when-recursing.patch + + + + + python3-tk + library + programming.language.python + Python modules for Tk + + python3 + tcl + tcltk + + + /usr/lib/python3*/tkinter + /usr/lib/python3*/lib-dynload/_tkinter.cpython-38m-x86_64-linux-gnu.so + /usr/lib/python3.6/turtledemo + + + + + idle3 + idle + app:gui + programming.environment + An Integrated Development Environment for Python + + python3-tk + python3 + + + /usr/bin/idle3* + /usr/lib/python*/idlelib + /usr/share/applications + /usr/share/pixmaps + + + python-logo.png + idle.desktop + + + + + + 2019-12-10 + 3.8.0 + First release + Idris Kalp + idriskalp@gmail.com + + + diff --git a/programming/language/python3/python3/pspec.xml b/programming/language/python3/python3/pspec.xml deleted file mode 100644 index cad29ebe0c..0000000000 --- a/programming/language/python3/python3/pspec.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - python3 - http://www.python.org/ - - PisiLinux Community - admins@pisilinux.org - - custom - programming.language - Next generation of the python high-level scripting language - Next generation of the python high-level scripting language - https://www.python.org/ftp/python/3.6.5/Python-3.6.5.tar.xz - - - bzip2 - xz-devel - tcl-devel - gdbm-devel - zlib-devel - tcltk-devel - expat-devel - libffi-devel - sqlite-devel - ncurses-devel - openssl-devel - readline-devel - mpdecimal-devel - - - dont-make-libpython-readonly.patch - - - - - python3 - - xz - gdbm - zlib - bzip2 - expat - libffi - sqlite - ncurses - openssl - readline - mpdecimal - - - /usr/bin/p* - /usr/bin/2to3* - /usr/lib/python3.6/a* - /usr/lib/python3.6/c* - /usr/lib/python3.6/d* - /usr/lib/python3.6/e* - /usr/lib/python3.6/h* - /usr/lib/python3.6/imp* - /usr/lib/python3.6/j* - /usr/lib/python3.6/lib2* - /usr/lib/python3.6/log* - /usr/lib/python3.6/m* - /usr/lib/python3.6/p* - /usr/lib/python3.6/s* - /usr/lib/python3.6/te* - /usr/lib/python3.6/u* - /usr/lib/python3.6/v* - /usr/lib/python3.6/w* - /usr/lib/python3.6/x* - /usr/lib/python3.6/*.py - /usr/lib/python3.6/*.txt - /usr/lib/python3.6/lib-dynload/_a* - /usr/lib/python3.6/lib-dynload/a* - /usr/lib/python3.6/lib-dynload/b* - /usr/lib/python3.6/lib-dynload/_b* - /usr/lib/python3.6/lib-dynload/c* - /usr/lib/python3.6/lib-dynload/_c* - /usr/lib/python3.6/lib-dynload/_d* - /usr/lib/python3.6/lib-dynload/_e* - /usr/lib/python3.6/lib-dynload/f* - /usr/lib/python3.6/lib-dynload/g* - /usr/lib/python3.6/lib-dynload/_g* - /usr/lib/python3.6/lib-dynload/_h* - /usr/lib/python3.6/lib-dynload/_j* - /usr/lib/python3.6/lib-dynload/_l* - /usr/lib/python3.6/lib-dynload/m* - /usr/lib/python3.6/lib-dynload/_m* - /usr/lib/python3.6/lib-dynload/n* - /usr/lib/python3.6/lib-dynload/o* - /usr/lib/python3.6/lib-dynload/_o* - /usr/lib/python3.6/lib-dynload/_p* - /usr/lib/python3.6/lib-dynload/p* - /usr/lib/python3.6/lib-dynload/r* - /usr/lib/python3.6/lib-dynload/_r* - /usr/lib/python3.6/lib-dynload/_s* - /usr/lib/python3.6/lib-dynload/s* - /usr/lib/python3.6/lib-dynload/te* - /usr/lib/python3.6/lib-dynload/_te* - /usr/lib/python3.6/lib-dynload/ti* - /usr/lib/python3.6/lib-dynload/u* - /usr/lib/python3.6/lib-dynload/x* - /usr/lib/python3.6/lib-dynload/z* - /usr/lib/python3.6/__pycache__ - /usr/lib/*.so - /usr/lib/libpython3.6m.so.1.0 - /usr/share/man/man1/* - /usr/share/doc - - - - - python3-devel - - python3 - - - /usr/include/python3.6m/* - /usr/lib/pkgconfig/* - - - - - python3-tk - library - programming.language.python - Python modules for Tk - - python3 - tcl - tcltk - - - /usr/lib/python3*/tkinter - /usr/lib/python3*/lib-dynload/_tkinter.cpython-36m-x86_64-linux-gnu.so - /usr/lib/python3.6/turtledemo - - - - - idle3 - idle - app:gui - programming.environment - An Integrated Development Environment for Python - - python3-tk - python3 - - - /usr/bin/idle3* - /usr/lib/python*/idlelib - /usr/share/applications - /usr/share/pixmaps - - - python-logo.png - idle.desktop - - - - - - 2018-07-31 - 3.6.5 - Rebuild. - mustafa Cinasal - muscnsl@gmail.com - - - 2018-05-09 - 3.6.5 - Version bump - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2018-01-31 - 3.6.0 - Rebuild - Ayhan Yalçınsoy - ayhanyalcinsoy@pisilinux.org - - - 2016-06-09 - 3.4.3 - Release Bump - Pisi Linux Community - admin@pisilinux.org - - - 2016-05-08 - 3.4.3 - Rebuild. - Ertuğrul Erata - ertugrulerata@gmail.com - - - 2015-08-13 - 3.4.3 - First release - Marcin Bojara - marcin@pisilinux.org - - -