From 8ad431812a2fd0265b4168331ca9939428391a75 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Mon, 23 Dec 2019 10:10:26 +0300 Subject: [PATCH] Rename python3 folders to python --- .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../django3-i686.install | 0 .../django3-x86_64.install | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../fonttools3-i686.install | 0 .../fonttools3-x86_64.install | 0 .../PKGBUILD | 24 +++++++-------- .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../ipython3-i686.install | 0 .../ipython3-x86_64.install | 0 .../PKGBUILD | 0 .../nbconvert3-i686.install | 0 .../nbconvert3-x86_64.install | 0 .../PKGBUILD | 0 .../001-jupyter-notebook-MINGW.patch | 0 .../PKGBUILD | 29 ++++++++++--------- .../jupyter_notebook3-i686.install | 14 +++++++++ .../jupyter_notebook3-x86_64.install | 14 +++++++++ .../PKGBUILD | 0 .../jupyter_console3-i686.install | 0 .../jupyter_console3-x86_64.install | 0 .../PKGBUILD | 0 .../mallard-ducktype3-i686.install | 0 .../mallard-ducktype3-x86_64.install | 0 .../PKGBUILD | 0 .../setupext.py.patch | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../0001-detect-mingw-environment.patch | 0 .../0002-fix-finding-python2.patch | 0 .../0003-gfortran-better-version-check.patch | 0 .../0004-fix-testsuite.patch | 0 ...stack-boundary-32bit-optimized-64bit.patch | 0 .../0006-disable-visualcompaq-for-mingw.patch | 0 ...7-disable-64bit-experimental-warning.patch | 0 ...-mingw-gcc-doesnt-support-visibility.patch | 0 .../0009-disable-old-mingw-stuff.patch | 0 .../0010-mingw-inline-stuff.patch | 0 .../PKGBUILD | 0 .../LICENSE | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../pylint3-i686.install | 0 .../pylint3-x86_64.install | 0 .../PKGBUILD | 0 .../pytest3-i686.install | 0 .../pytest3-x86_64.install | 0 .../PKGBUILD | 0 .../mingw-build.patch | 0 .../PKGBUILD | 0 .../001-mingw-python-openmp-flag.patch | 0 .../002-openmp-cleanup-wait.patch | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 4 +-- .../sphinx3-i686.install | 0 .../sphinx3-x86_64.install | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 .../PKGBUILD | 0 ...0-make-_sysconfigdata.py-relocatable.patch | 0 ...e_args-using-subprocess-list2cmdline.patch | 0 .../0002-restore-setup-config.patch | 0 .../0100-MINGW-BASE-use-NT-thread-model.patch | 0 ...gcc-internal-defines-to-python-platf.patch | 0 ...igure-MACHDEP-and-platform-for-build.patch | 0 ...0140-MINGW-preset-configure-defaults.patch | 0 ...largefile-support-for-windows-builds.patch | 0 ...0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch | 0 .../0180-MINGW-init-system-calls.patch | 0 ...INGW-build-in-windows-modules-winreg.patch | 0 ...etermine-if-pwdmodule-should-be-used.patch | 0 ...ler-customize-mingw-cygwin-compilers.patch | 0 ...0260-MINGW-compiler-enable-new-dtags.patch | 0 ...-Mingw-recognition-to-pyport.h-to-al.patch | 0 ...300-MINGW-configure-for-shared-build.patch | 0 .../0310-MINGW-dynamic-loading-support.patch | 0 ...nore-main-program-for-frozen-scripts.patch | 0 ...-MINGW-setup-_multiprocessing-module.patch | 0 .../0360-MINGW-setup-select-module.patch | 0 ...up-_ctypes-module-with-system-libffi.patch | 0 ...ct-winsock2-and-setup-_socket-module.patch | 0 ...0390-MINGW-exclude-unix-only-modules.patch | 0 ...NGW-setup-msvcrt-and-_winapi-modules.patch | 0 ...0410-MINGW-build-extensions-with-GCC.patch | 0 ...2CCompiler-as-default-compiler-for-m.patch | 0 .../0430-MINGW-find-import-library.patch | 0 .../0440-MINGW-setup-_ssl-module.patch | 0 ...ation-of-posix-build-in-sysconfig.py.patch | 0 ...W-support-stdcall-without-underscore.patch | 0 ...ead-rename-to-avoid-failure-on-windo.patch | 0 ...ular-dependency-from-time-module-dur.patch | 0 ...tion-of-posix-build-in-distutils-sys.patch | 0 .../0490-MINGW-customize-site.patch | 0 .../0500-add-python-config-sh.patch | 0 .../0510-cross-darwin-feature.patch | 0 ...520-py3k-mingw-ntthreads-vs-pthreads.patch | 0 .../0530-mingw-system-libffi.patch | 0 ...sys-mingw-prefer-unix-sep-if-MSYSTEM.patch | 0 .../0560-mingw-use-posix-getpath.patch | 0 ...mingw-add-ModuleFileName-dir-to-PATH.patch | 0 ...dd-BUILDIN_WIN32_MODULEs-time-msvcrt.patch | 0 ...s-cygwin-semi-native-build-sysconfig.patch | 0 .../0620-mingw-sysconfig-like-posix.patch | 0 ...builtin_for_Popen_in_cygwinccompiler.patch | 0 ...x86_64-size_t-format-specifier-pid_t.patch | 0 ...d-multiarch-paths-if-cross-compiling.patch | 0 ...ngw-use-backslashes-in-compileall-py.patch | 0 ...-msys-convert_path-fix-and-root-hack.patch | 0 .../0690-allow-static-tcltk.patch | 0 .../0720-mingw-pdcurses_ISPAD.patch | 0 .../0740-grammar-fixes.patch | 0 .../0750-builddir-fixes.patch | 0 ...sys-monkeypatch-os-system-via-sh-exe.patch | 0 ...place-slashes-used-in-io-redirection.patch | 0 .../0800-mingw-install-layout-as-posix.patch | 0 .../0810-remove_path_max.default.patch | 0 .../0820-dont-link-with-gettext.patch | 0 .../0830-ctypes-python-dll.patch | 0 .../0840-gdbm-module-includes.patch | 0 .../0850-use-gnu_printf-in-format.patch | 0 ...w-fix-ssl-dont-use-enum_certificates.patch | 0 .../0890-mingw-build-optimized-ext.patch | 0 ...mpiler-dont-strip-modules-if-pydebug.patch | 0 ...fix-using-dllhandle-and-winver-mingw.patch | 0 ...0920-mingw-add-LIBPL-to-library-dirs.patch | 0 ...msvccompiler-get_build_version-works.patch | 0 ...0-MINGW-link-with-additional-library.patch | 0 .../1010-install-msilib.patch | 0 ...060-dont-include-system-ncurses-path.patch | 0 .../1620-fix-signal-module-build.patch | 0 .../1630-build-winconsoleio.patch | 0 .../1650-expose-sem_unlink.patch | 0 .../1700-cygpty-isatty.patch | 0 .../1701-disable-broken-gdbm-module.patch | 0 ...win-resource-files-and-build-pythonw.patch | 0 .../1810-3.7-mpdec-mingw.patch | 0 ...lement-setenv-for-PY_COERCE_C_LOCALE.patch | 0 .../1850-disable-readline.patch | 0 .../1860-fix-isselectable.patch | 0 ...70-use-_wcsnicmp-instead-wcsncasecmp.patch | 0 .../1880-make-default-python.patch | 0 .../1890-_xxsubinterpretersmodule.patch | 0 .../2010-configure-have-inet-pton.patch | 0 .../2030-fix-msvc9-import.patch | 0 .../2050-undo-venv-redirector.patch | 0 .../2051-set-venv-activate-path-unix.patch | 0 ...ove-msys-from-env-and-add-exe-prefix.patch | 0 .../2060-pass-gen-profile-ldflags.patch | 0 ...tutils-add-windmc-to-cygwinccompiler.patch | 0 ...indows-must-link-ext-with-python-lib.patch | 0 .../3000-importlib-bootstrap-path-sep.patch | 0 .../5000-warnings-fixes.patch | 0 .../PKGBUILD | 0 .../smoketests.py | 0 174 files changed, 57 insertions(+), 28 deletions(-) rename {mingw-w64-python3-astroid => mingw-w64-python-astroid}/PKGBUILD (100%) rename {mingw-w64-python3-binwalk => mingw-w64-python-binwalk}/PKGBUILD (100%) rename {mingw-w64-python3-breathe => mingw-w64-python-breathe}/PKGBUILD (100%) rename {mingw-w64-python3-can => mingw-w64-python-can}/PKGBUILD (100%) rename {mingw-w64-python3-cmd2 => mingw-w64-python-cmd2}/PKGBUILD (100%) rename {mingw-w64-python3-contextlib2 => mingw-w64-python-contextlib2}/PKGBUILD (100%) rename {mingw-w64-python3-cx_Freeze => mingw-w64-python-cx_Freeze}/PKGBUILD (100%) rename {mingw-w64-python3-django => mingw-w64-python-django}/PKGBUILD (100%) rename {mingw-w64-python3-django => mingw-w64-python-django}/django3-i686.install (100%) rename {mingw-w64-python3-django => mingw-w64-python-django}/django3-x86_64.install (100%) rename {mingw-w64-python3-entrypoints => mingw-w64-python-entrypoints}/PKGBUILD (100%) rename {mingw-w64-python3-fonttools => mingw-w64-python-fonttools}/PKGBUILD (100%) rename {mingw-w64-python3-fonttools => mingw-w64-python-fonttools}/fonttools3-i686.install (100%) rename {mingw-w64-python3-fonttools => mingw-w64-python-fonttools}/fonttools3-x86_64.install (100%) rename {mingw-w64-python3-imbalanced-learn => mingw-w64-python-imbalanced-learn}/PKGBUILD (68%) rename {mingw-w64-python3-importlib-metadata => mingw-w64-python-importlib-metadata}/PKGBUILD (100%) rename {mingw-w64-python3-ipykernel => mingw-w64-python-ipykernel}/PKGBUILD (100%) rename {mingw-w64-python3-ipython => mingw-w64-python-ipython}/PKGBUILD (100%) rename {mingw-w64-python3-ipython => mingw-w64-python-ipython}/ipython3-i686.install (100%) rename {mingw-w64-python3-ipython => mingw-w64-python-ipython}/ipython3-x86_64.install (100%) rename {mingw-w64-python3-jupyter-nbconvert => mingw-w64-python-jupyter-nbconvert}/PKGBUILD (100%) rename {mingw-w64-python3-jupyter-nbconvert => mingw-w64-python-jupyter-nbconvert}/nbconvert3-i686.install (100%) rename {mingw-w64-python3-jupyter-nbconvert => mingw-w64-python-jupyter-nbconvert}/nbconvert3-x86_64.install (100%) rename {mingw-w64-python3-jupyter-nbformat => mingw-w64-python-jupyter-nbformat}/PKGBUILD (100%) rename {mingw-w64-python3-jupyter-notebook => mingw-w64-python-jupyter-notebook}/001-jupyter-notebook-MINGW.patch (100%) rename {mingw-w64-python3-jupyter-notebook => mingw-w64-python-jupyter-notebook}/PKGBUILD (75%) create mode 100644 mingw-w64-python-jupyter-notebook/jupyter_notebook3-i686.install create mode 100644 mingw-w64-python-jupyter-notebook/jupyter_notebook3-x86_64.install rename {mingw-w64-python3-jupyter_console => mingw-w64-python-jupyter_console}/PKGBUILD (100%) rename {mingw-w64-python3-jupyter_console => mingw-w64-python-jupyter_console}/jupyter_console3-i686.install (100%) rename {mingw-w64-python3-jupyter_console => mingw-w64-python-jupyter_console}/jupyter_console3-x86_64.install (100%) rename {mingw-w64-python3-mallard-ducktype => mingw-w64-python-mallard-ducktype}/PKGBUILD (100%) rename {mingw-w64-python3-mallard-ducktype => mingw-w64-python-mallard-ducktype}/mallard-ducktype3-i686.install (100%) rename {mingw-w64-python3-mallard-ducktype => mingw-w64-python-mallard-ducktype}/mallard-ducktype3-x86_64.install (100%) rename {mingw-w64-python3-matplotlib => mingw-w64-python-matplotlib}/PKGBUILD (100%) rename {mingw-w64-python3-matplotlib => mingw-w64-python-matplotlib}/setupext.py.patch (100%) rename {mingw-w64-python3-more-itertools => mingw-w64-python-more-itertools}/PKGBUILD (100%) rename {mingw-w64-python3-networkx => mingw-w64-python-networkx}/PKGBUILD (100%) rename {mingw-w64-python3-numpy => mingw-w64-python-numpy}/0001-detect-mingw-environment.patch (100%) rename {mingw-w64-python3-numpy => mingw-w64-python-numpy}/0002-fix-finding-python2.patch (100%) rename {mingw-w64-python3-numpy => mingw-w64-python-numpy}/0003-gfortran-better-version-check.patch (100%) rename {mingw-w64-python3-numpy => mingw-w64-python-numpy}/0004-fix-testsuite.patch (100%) rename {mingw-w64-python3-numpy => mingw-w64-python-numpy}/0005-mincoming-stack-boundary-32bit-optimized-64bit.patch (100%) rename {mingw-w64-python3-numpy => mingw-w64-python-numpy}/0006-disable-visualcompaq-for-mingw.patch (100%) rename {mingw-w64-python3-numpy => mingw-w64-python-numpy}/0007-disable-64bit-experimental-warning.patch (100%) rename {mingw-w64-python3-numpy => mingw-w64-python-numpy}/0008-mingw-gcc-doesnt-support-visibility.patch (100%) rename {mingw-w64-python3-numpy => mingw-w64-python-numpy}/0009-disable-old-mingw-stuff.patch (100%) rename {mingw-w64-python3-numpy => mingw-w64-python-numpy}/0010-mingw-inline-stuff.patch (100%) rename {mingw-w64-python3-numpy => mingw-w64-python-numpy}/PKGBUILD (100%) rename {mingw-w64-python3-openpyxl => mingw-w64-python-openpyxl}/LICENSE (100%) rename {mingw-w64-python3-openpyxl => mingw-w64-python-openpyxl}/PKGBUILD (100%) rename {mingw-w64-python3-pandas => mingw-w64-python-pandas}/PKGBUILD (100%) rename {mingw-w64-python3-path => mingw-w64-python-path}/PKGBUILD (100%) rename {mingw-w64-python3-pylint => mingw-w64-python-pylint}/PKGBUILD (100%) rename {mingw-w64-python3-pylint => mingw-w64-python-pylint}/pylint3-i686.install (100%) rename {mingw-w64-python3-pylint => mingw-w64-python-pylint}/pylint3-x86_64.install (100%) rename {mingw-w64-python3-pytest => mingw-w64-python-pytest}/PKGBUILD (100%) rename {mingw-w64-python3-pytest => mingw-w64-python-pytest}/pytest3-i686.install (100%) rename {mingw-w64-python3-pytest => mingw-w64-python-pytest}/pytest3-x86_64.install (100%) rename {mingw-w64-python3-python_ics => mingw-w64-python-python_ics}/PKGBUILD (100%) rename {mingw-w64-python3-python_ics => mingw-w64-python-python_ics}/mingw-build.patch (100%) rename {mingw-w64-python3-pywavelets => mingw-w64-python-pywavelets}/PKGBUILD (100%) rename {mingw-w64-python3-scikit-learn => mingw-w64-python-scikit-learn}/001-mingw-python-openmp-flag.patch (100%) rename {mingw-w64-python3-scikit-learn => mingw-w64-python-scikit-learn}/002-openmp-cleanup-wait.patch (100%) rename {mingw-w64-python3-scikit-learn => mingw-w64-python-scikit-learn}/PKGBUILD (100%) rename {mingw-w64-python3-scipy => mingw-w64-python-scipy}/PKGBUILD (100%) rename {mingw-w64-python3-sphinx => mingw-w64-python-sphinx}/PKGBUILD (96%) rename {mingw-w64-python3-sphinx => mingw-w64-python-sphinx}/sphinx3-i686.install (100%) rename {mingw-w64-python3-sphinx => mingw-w64-python-sphinx}/sphinx3-x86_64.install (100%) rename {mingw-w64-python3-sphinxcontrib-applehelp => mingw-w64-python-sphinxcontrib-applehelp}/PKGBUILD (100%) rename {mingw-w64-python3-sphinxcontrib-devhelp => mingw-w64-python-sphinxcontrib-devhelp}/PKGBUILD (100%) rename {mingw-w64-python3-sphinxcontrib-htmlhelp => mingw-w64-python-sphinxcontrib-htmlhelp}/PKGBUILD (100%) rename {mingw-w64-python3-sphinxcontrib-jsmath => mingw-w64-python-sphinxcontrib-jsmath}/PKGBUILD (100%) rename {mingw-w64-python3-sphinxcontrib-qthelp => mingw-w64-python-sphinxcontrib-qthelp}/PKGBUILD (100%) rename {mingw-w64-python3-sphinxcontrib-serializinghtml => mingw-w64-python-sphinxcontrib-serializinghtml}/PKGBUILD (100%) rename {mingw-w64-python3-testpath => mingw-w64-python-testpath}/PKGBUILD (100%) rename {mingw-w64-python3-typed_ast => mingw-w64-python-typed_ast}/PKGBUILD (100%) rename {mingw-w64-python3-udsoncan => mingw-w64-python-udsoncan}/PKGBUILD (100%) rename {mingw-w64-python3-zeroconf => mingw-w64-python-zeroconf}/PKGBUILD (100%) rename {mingw-w64-python3 => mingw-w64-python}/0000-make-_sysconfigdata.py-relocatable.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0001-fix-_nt_quote_args-using-subprocess-list2cmdline.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0002-restore-setup-config.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0100-MINGW-BASE-use-NT-thread-model.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0130-MINGW-configure-MACHDEP-and-platform-for-build.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0140-MINGW-preset-configure-defaults.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0150-MINGW-configure-largefile-support-for-windows-builds.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0180-MINGW-init-system-calls.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0200-MINGW-build-in-windows-modules-winreg.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0210-MINGW-determine-if-pwdmodule-should-be-used.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0250-MINGW-compiler-customize-mingw-cygwin-compilers.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0260-MINGW-compiler-enable-new-dtags.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0290-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0300-MINGW-configure-for-shared-build.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0310-MINGW-dynamic-loading-support.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0330-MINGW-ignore-main-program-for-frozen-scripts.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0350-MINGW-setup-_multiprocessing-module.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0360-MINGW-setup-select-module.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0380-MINGW-defect-winsock2-and-setup-_socket-module.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0390-MINGW-exclude-unix-only-modules.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0410-MINGW-build-extensions-with-GCC.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0420-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0430-MINGW-find-import-library.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0440-MINGW-setup-_ssl-module.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0460-MINGW-generalization-of-posix-build-in-sysconfig.py.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0462-MINGW-support-stdcall-without-underscore.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0470-MINGW-avoid-circular-dependency-from-time-module-dur.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0480-MINGW-generalization-of-posix-build-in-distutils-sys.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0490-MINGW-customize-site.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0500-add-python-config-sh.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0510-cross-darwin-feature.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0520-py3k-mingw-ntthreads-vs-pthreads.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0530-mingw-system-libffi.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0560-mingw-use-posix-getpath.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0565-mingw-add-ModuleFileName-dir-to-PATH.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0570-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0610-msys-cygwin-semi-native-build-sysconfig.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0620-mingw-sysconfig-like-posix.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0640-mingw-x86_64-size_t-format-specifier-pid_t.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0650-cross-dont-add-multiarch-paths-if-cross-compiling.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0660-mingw-use-backslashes-in-compileall-py.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0670-msys-convert_path-fix-and-root-hack.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0690-allow-static-tcltk.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0720-mingw-pdcurses_ISPAD.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0740-grammar-fixes.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0750-builddir-fixes.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0760-msys-monkeypatch-os-system-via-sh-exe.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0770-msys-replace-slashes-used-in-io-redirection.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0800-mingw-install-layout-as-posix.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0810-remove_path_max.default.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0820-dont-link-with-gettext.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0830-ctypes-python-dll.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0840-gdbm-module-includes.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0850-use-gnu_printf-in-format.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0870-mingw-fix-ssl-dont-use-enum_certificates.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0890-mingw-build-optimized-ext.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0900-cygwinccompiler-dont-strip-modules-if-pydebug.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0910-fix-using-dllhandle-and-winver-mingw.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0920-mingw-add-LIBPL-to-library-dirs.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/0990-MINGW-link-with-additional-library.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1010-install-msilib.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1060-dont-include-system-ncurses-path.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1620-fix-signal-module-build.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1630-build-winconsoleio.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1650-expose-sem_unlink.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1700-cygpty-isatty.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1701-disable-broken-gdbm-module.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1800-link-win-resource-files-and-build-pythonw.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1810-3.7-mpdec-mingw.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1830-mingw-implement-setenv-for-PY_COERCE_C_LOCALE.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1850-disable-readline.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1860-fix-isselectable.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1870-use-_wcsnicmp-instead-wcsncasecmp.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1880-make-default-python.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/1890-_xxsubinterpretersmodule.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/2010-configure-have-inet-pton.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/2030-fix-msvc9-import.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/2050-undo-venv-redirector.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/2051-set-venv-activate-path-unix.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/2052-venv-remove-msys-from-env-and-add-exe-prefix.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/2060-pass-gen-profile-ldflags.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/2070-distutils-add-windmc-to-cygwinccompiler.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/2080-pkg-config-windows-must-link-ext-with-python-lib.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/3000-importlib-bootstrap-path-sep.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/5000-warnings-fixes.patch (100%) rename {mingw-w64-python3 => mingw-w64-python}/PKGBUILD (100%) rename {mingw-w64-python3 => mingw-w64-python}/smoketests.py (100%) diff --git a/mingw-w64-python3-astroid/PKGBUILD b/mingw-w64-python-astroid/PKGBUILD similarity index 100% rename from mingw-w64-python3-astroid/PKGBUILD rename to mingw-w64-python-astroid/PKGBUILD diff --git a/mingw-w64-python3-binwalk/PKGBUILD b/mingw-w64-python-binwalk/PKGBUILD similarity index 100% rename from mingw-w64-python3-binwalk/PKGBUILD rename to mingw-w64-python-binwalk/PKGBUILD diff --git a/mingw-w64-python3-breathe/PKGBUILD b/mingw-w64-python-breathe/PKGBUILD similarity index 100% rename from mingw-w64-python3-breathe/PKGBUILD rename to mingw-w64-python-breathe/PKGBUILD diff --git a/mingw-w64-python3-can/PKGBUILD b/mingw-w64-python-can/PKGBUILD similarity index 100% rename from mingw-w64-python3-can/PKGBUILD rename to mingw-w64-python-can/PKGBUILD diff --git a/mingw-w64-python3-cmd2/PKGBUILD b/mingw-w64-python-cmd2/PKGBUILD similarity index 100% rename from mingw-w64-python3-cmd2/PKGBUILD rename to mingw-w64-python-cmd2/PKGBUILD diff --git a/mingw-w64-python3-contextlib2/PKGBUILD b/mingw-w64-python-contextlib2/PKGBUILD similarity index 100% rename from mingw-w64-python3-contextlib2/PKGBUILD rename to mingw-w64-python-contextlib2/PKGBUILD diff --git a/mingw-w64-python3-cx_Freeze/PKGBUILD b/mingw-w64-python-cx_Freeze/PKGBUILD similarity index 100% rename from mingw-w64-python3-cx_Freeze/PKGBUILD rename to mingw-w64-python-cx_Freeze/PKGBUILD diff --git a/mingw-w64-python3-django/PKGBUILD b/mingw-w64-python-django/PKGBUILD similarity index 100% rename from mingw-w64-python3-django/PKGBUILD rename to mingw-w64-python-django/PKGBUILD diff --git a/mingw-w64-python3-django/django3-i686.install b/mingw-w64-python-django/django3-i686.install similarity index 100% rename from mingw-w64-python3-django/django3-i686.install rename to mingw-w64-python-django/django3-i686.install diff --git a/mingw-w64-python3-django/django3-x86_64.install b/mingw-w64-python-django/django3-x86_64.install similarity index 100% rename from mingw-w64-python3-django/django3-x86_64.install rename to mingw-w64-python-django/django3-x86_64.install diff --git a/mingw-w64-python3-entrypoints/PKGBUILD b/mingw-w64-python-entrypoints/PKGBUILD similarity index 100% rename from mingw-w64-python3-entrypoints/PKGBUILD rename to mingw-w64-python-entrypoints/PKGBUILD diff --git a/mingw-w64-python3-fonttools/PKGBUILD b/mingw-w64-python-fonttools/PKGBUILD similarity index 100% rename from mingw-w64-python3-fonttools/PKGBUILD rename to mingw-w64-python-fonttools/PKGBUILD diff --git a/mingw-w64-python3-fonttools/fonttools3-i686.install b/mingw-w64-python-fonttools/fonttools3-i686.install similarity index 100% rename from mingw-w64-python3-fonttools/fonttools3-i686.install rename to mingw-w64-python-fonttools/fonttools3-i686.install diff --git a/mingw-w64-python3-fonttools/fonttools3-x86_64.install b/mingw-w64-python-fonttools/fonttools3-x86_64.install similarity index 100% rename from mingw-w64-python3-fonttools/fonttools3-x86_64.install rename to mingw-w64-python-fonttools/fonttools3-x86_64.install diff --git a/mingw-w64-python3-imbalanced-learn/PKGBUILD b/mingw-w64-python-imbalanced-learn/PKGBUILD similarity index 68% rename from mingw-w64-python3-imbalanced-learn/PKGBUILD rename to mingw-w64-python-imbalanced-learn/PKGBUILD index 68e999fdc0..330e9d1db6 100644 --- a/mingw-w64-python3-imbalanced-learn/PKGBUILD +++ b/mingw-w64-python-imbalanced-learn/PKGBUILD @@ -4,18 +4,21 @@ _realname=imbalanced-learn pkgbase=mingw-w64-python3-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="A Python Package to Tackle the Curse of Imbalanced Datasets in Machine Learning (mingw-w64)" arch=('any') url='https://github.com/scikit-learn-contrib/imbalanced-learn' license=('MIT') -makedepends=("${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-python3-setuptools" - "${MINGW_PACKAGE_PREFIX}-python3-numpy" - "${MINGW_PACKAGE_PREFIX}-python3-scikit-learn" - "${MINGW_PACKAGE_PREFIX}-cython" - ) -source=("${_realname}-${pkgver}.tar.gz::https://github.com/scikit-learn-contrib//${_realname}/archive/${pkgver}.tar.gz") +depends=("${MINGW_PACKAGE_PREFIX}-python3" + "${MINGW_PACKAGE_PREFIX}-python3-joblib" + "${MINGW_PACKAGE_PREFIX}-python3-numpy" + "${MINGW_PACKAGE_PREFIX}-python3-scikit-learn" + "${MINGW_PACKAGE_PREFIX}-python3-scipy") +makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools" + "${MINGW_PACKAGE_PREFIX}-cython") +optdepends=("${MINGW_PACKAGE_PREFIX}-python3-keras" + "${MINGW_PACKAGE_PREFIX}-python3-tensoflow") +source=("${_realname}-${pkgver}.tar.gz::https://github.com/scikit-learn-contrib/${_realname}/archive/${pkgver}.tar.gz") sha256sums=('3bad0144b0ecc078d29026ce785f3160d00eba1ffdcb51ffcff56e840f8c68fb') prepare() { @@ -31,11 +34,6 @@ build() { } package() { - depends=("${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-python3-numpy" - "${MINGW_PACKAGE_PREFIX}-python3-scipy" - ) - cd "${srcdir}/python3-build-${CARCH}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \ diff --git a/mingw-w64-python3-importlib-metadata/PKGBUILD b/mingw-w64-python-importlib-metadata/PKGBUILD similarity index 100% rename from mingw-w64-python3-importlib-metadata/PKGBUILD rename to mingw-w64-python-importlib-metadata/PKGBUILD diff --git a/mingw-w64-python3-ipykernel/PKGBUILD b/mingw-w64-python-ipykernel/PKGBUILD similarity index 100% rename from mingw-w64-python3-ipykernel/PKGBUILD rename to mingw-w64-python-ipykernel/PKGBUILD diff --git a/mingw-w64-python3-ipython/PKGBUILD b/mingw-w64-python-ipython/PKGBUILD similarity index 100% rename from mingw-w64-python3-ipython/PKGBUILD rename to mingw-w64-python-ipython/PKGBUILD diff --git a/mingw-w64-python3-ipython/ipython3-i686.install b/mingw-w64-python-ipython/ipython3-i686.install similarity index 100% rename from mingw-w64-python3-ipython/ipython3-i686.install rename to mingw-w64-python-ipython/ipython3-i686.install diff --git a/mingw-w64-python3-ipython/ipython3-x86_64.install b/mingw-w64-python-ipython/ipython3-x86_64.install similarity index 100% rename from mingw-w64-python3-ipython/ipython3-x86_64.install rename to mingw-w64-python-ipython/ipython3-x86_64.install diff --git a/mingw-w64-python3-jupyter-nbconvert/PKGBUILD b/mingw-w64-python-jupyter-nbconvert/PKGBUILD similarity index 100% rename from mingw-w64-python3-jupyter-nbconvert/PKGBUILD rename to mingw-w64-python-jupyter-nbconvert/PKGBUILD diff --git a/mingw-w64-python3-jupyter-nbconvert/nbconvert3-i686.install b/mingw-w64-python-jupyter-nbconvert/nbconvert3-i686.install similarity index 100% rename from mingw-w64-python3-jupyter-nbconvert/nbconvert3-i686.install rename to mingw-w64-python-jupyter-nbconvert/nbconvert3-i686.install diff --git a/mingw-w64-python3-jupyter-nbconvert/nbconvert3-x86_64.install b/mingw-w64-python-jupyter-nbconvert/nbconvert3-x86_64.install similarity index 100% rename from mingw-w64-python3-jupyter-nbconvert/nbconvert3-x86_64.install rename to mingw-w64-python-jupyter-nbconvert/nbconvert3-x86_64.install diff --git a/mingw-w64-python3-jupyter-nbformat/PKGBUILD b/mingw-w64-python-jupyter-nbformat/PKGBUILD similarity index 100% rename from mingw-w64-python3-jupyter-nbformat/PKGBUILD rename to mingw-w64-python-jupyter-nbformat/PKGBUILD diff --git a/mingw-w64-python3-jupyter-notebook/001-jupyter-notebook-MINGW.patch b/mingw-w64-python-jupyter-notebook/001-jupyter-notebook-MINGW.patch similarity index 100% rename from mingw-w64-python3-jupyter-notebook/001-jupyter-notebook-MINGW.patch rename to mingw-w64-python-jupyter-notebook/001-jupyter-notebook-MINGW.patch diff --git a/mingw-w64-python3-jupyter-notebook/PKGBUILD b/mingw-w64-python-jupyter-notebook/PKGBUILD similarity index 75% rename from mingw-w64-python3-jupyter-notebook/PKGBUILD rename to mingw-w64-python-jupyter-notebook/PKGBUILD index 5e6d4029b3..e300b65a1a 100644 --- a/mingw-w64-python3-jupyter-notebook/PKGBUILD +++ b/mingw-w64-python-jupyter-notebook/PKGBUILD @@ -8,13 +8,13 @@ _realname=notebook pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=5.7.4 +pkgver=6.0.1 pkgrel=1 pkgdesc="The language-agnostic HTML notebook application for Project Jupyter" arch=('any') url="https://github.com/jupyter/notebook" license=('BSD') - +install=jupyter_notebook3-${CARCH}.install depends=("${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-python3-jupyter_core" "${MINGW_PACKAGE_PREFIX}-python3-jupyter_client" @@ -35,27 +35,24 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools" "${MINGW_PACKAGE_PREFIX}-yarn" "${MINGW_PACKAGE_PREFIX}-bower" ) - -source=("$pkgname-$pkgver.tgz::https://github.com/jupyter/notebook/archive/$pkgver.tar.gz" +source=("${_realname}-${pkgver}.tgz::https://github.com/jupyter/notebook/archive/${pkgver}.tar.gz" "001-jupyter-notebook-MINGW.patch") -sha256sums=('c26c67ee16a64b6d2444884b73c399d8020f598f833f4165864e31f28d1c410e' +sha256sums=('fb9bff7913c9e4b148e0a4df41aa527a7c4fd5f01fc7ec3cab03aa07eb6a19d4' '0362ef7944792188d8202bdedd7b51b9a0a06867ea43f480bf8318b163d3b616') prepare(){ - cd "$srcdir/${_realname}-$pkgver" - patch -p1 -i ${srcdir}/001-jupyter-notebook-MINGW.patch + cd "${srcdir}/${_realname}-${pkgver}" + #patch -p1 -i ${srcdir}/001-jupyter-notebook-MINGW.patch } build() { - - cd "$srcdir/${_realname}-$pkgver" - + cd "${srcdir}/${_realname}-${pkgver}" + start //wait ${MINGW_PREFIX}/bin/npm install ${MINGW_PREFIX}/bin/python3 setup.py build } package() { - - cd "$srcdir/${_realname}-$pkgver" + cd "${srcdir}/${_realname}-${pkgver}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \ --root="${pkgdir}" --optimize=1 --skip-build @@ -63,10 +60,16 @@ package() { install -Dm644 COPYING.md "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE" # Remove hard coded library paths in css map files - local TOKEN_TOREPLACE=$(cygpath -am ${srcdir}/${_realname}-$pkgver/${_realname}/static) + local TOKEN_TOREPLACE=$(cygpath -am ${srcdir}/${_realname}-${pkgver}/${_realname}/static) pushd "${pkgdir}${MINGW_PREFIX}/lib/python3.7/site-packages/notebook/static/style/" > /dev/null sed -s "s|${TOKEN_TOREPLACE}|..|g" -i ./ipython.min.css.map sed -s "s|${TOKEN_TOREPLACE}|..|g" -i ./style.min.css.map popd > /dev/null + + local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) + # fix python command in files + for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do + sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f} + done } diff --git a/mingw-w64-python-jupyter-notebook/jupyter_notebook3-i686.install b/mingw-w64-python-jupyter-notebook/jupyter_notebook3-i686.install new file mode 100644 index 0000000000..9cb622c85e --- /dev/null +++ b/mingw-w64-python-jupyter-notebook/jupyter_notebook3-i686.install @@ -0,0 +1,14 @@ +post_install() { + cd mingw32 + local _prefix=$(pwd -W) + cd - + local _it + for _it in jupyter-{bundlerextension,nbextension,notebook,serverextension}; do + sed -e "s|/mingw32|${_prefix}|g" \ + -i ${_prefix}/bin/${_it}-script.py + done +} + +post_upgrade() { + post_install +} diff --git a/mingw-w64-python-jupyter-notebook/jupyter_notebook3-x86_64.install b/mingw-w64-python-jupyter-notebook/jupyter_notebook3-x86_64.install new file mode 100644 index 0000000000..4bae45cc7e --- /dev/null +++ b/mingw-w64-python-jupyter-notebook/jupyter_notebook3-x86_64.install @@ -0,0 +1,14 @@ +post_install() { + cd mingw64 + local _prefix=$(pwd -W) + cd - + local _it + for _it in jupyter-{bundlerextension,nbextension,notebook,serverextension}; do + sed -e "s|/mingw64|${_prefix}|g" \ + -i ${_prefix}/bin/${_it}-script.py + done +} + +post_upgrade() { + post_install +} diff --git a/mingw-w64-python3-jupyter_console/PKGBUILD b/mingw-w64-python-jupyter_console/PKGBUILD similarity index 100% rename from mingw-w64-python3-jupyter_console/PKGBUILD rename to mingw-w64-python-jupyter_console/PKGBUILD diff --git a/mingw-w64-python3-jupyter_console/jupyter_console3-i686.install b/mingw-w64-python-jupyter_console/jupyter_console3-i686.install similarity index 100% rename from mingw-w64-python3-jupyter_console/jupyter_console3-i686.install rename to mingw-w64-python-jupyter_console/jupyter_console3-i686.install diff --git a/mingw-w64-python3-jupyter_console/jupyter_console3-x86_64.install b/mingw-w64-python-jupyter_console/jupyter_console3-x86_64.install similarity index 100% rename from mingw-w64-python3-jupyter_console/jupyter_console3-x86_64.install rename to mingw-w64-python-jupyter_console/jupyter_console3-x86_64.install diff --git a/mingw-w64-python3-mallard-ducktype/PKGBUILD b/mingw-w64-python-mallard-ducktype/PKGBUILD similarity index 100% rename from mingw-w64-python3-mallard-ducktype/PKGBUILD rename to mingw-w64-python-mallard-ducktype/PKGBUILD diff --git a/mingw-w64-python3-mallard-ducktype/mallard-ducktype3-i686.install b/mingw-w64-python-mallard-ducktype/mallard-ducktype3-i686.install similarity index 100% rename from mingw-w64-python3-mallard-ducktype/mallard-ducktype3-i686.install rename to mingw-w64-python-mallard-ducktype/mallard-ducktype3-i686.install diff --git a/mingw-w64-python3-mallard-ducktype/mallard-ducktype3-x86_64.install b/mingw-w64-python-mallard-ducktype/mallard-ducktype3-x86_64.install similarity index 100% rename from mingw-w64-python3-mallard-ducktype/mallard-ducktype3-x86_64.install rename to mingw-w64-python-mallard-ducktype/mallard-ducktype3-x86_64.install diff --git a/mingw-w64-python3-matplotlib/PKGBUILD b/mingw-w64-python-matplotlib/PKGBUILD similarity index 100% rename from mingw-w64-python3-matplotlib/PKGBUILD rename to mingw-w64-python-matplotlib/PKGBUILD diff --git a/mingw-w64-python3-matplotlib/setupext.py.patch b/mingw-w64-python-matplotlib/setupext.py.patch similarity index 100% rename from mingw-w64-python3-matplotlib/setupext.py.patch rename to mingw-w64-python-matplotlib/setupext.py.patch diff --git a/mingw-w64-python3-more-itertools/PKGBUILD b/mingw-w64-python-more-itertools/PKGBUILD similarity index 100% rename from mingw-w64-python3-more-itertools/PKGBUILD rename to mingw-w64-python-more-itertools/PKGBUILD diff --git a/mingw-w64-python3-networkx/PKGBUILD b/mingw-w64-python-networkx/PKGBUILD similarity index 100% rename from mingw-w64-python3-networkx/PKGBUILD rename to mingw-w64-python-networkx/PKGBUILD diff --git a/mingw-w64-python3-numpy/0001-detect-mingw-environment.patch b/mingw-w64-python-numpy/0001-detect-mingw-environment.patch similarity index 100% rename from mingw-w64-python3-numpy/0001-detect-mingw-environment.patch rename to mingw-w64-python-numpy/0001-detect-mingw-environment.patch diff --git a/mingw-w64-python3-numpy/0002-fix-finding-python2.patch b/mingw-w64-python-numpy/0002-fix-finding-python2.patch similarity index 100% rename from mingw-w64-python3-numpy/0002-fix-finding-python2.patch rename to mingw-w64-python-numpy/0002-fix-finding-python2.patch diff --git a/mingw-w64-python3-numpy/0003-gfortran-better-version-check.patch b/mingw-w64-python-numpy/0003-gfortran-better-version-check.patch similarity index 100% rename from mingw-w64-python3-numpy/0003-gfortran-better-version-check.patch rename to mingw-w64-python-numpy/0003-gfortran-better-version-check.patch diff --git a/mingw-w64-python3-numpy/0004-fix-testsuite.patch b/mingw-w64-python-numpy/0004-fix-testsuite.patch similarity index 100% rename from mingw-w64-python3-numpy/0004-fix-testsuite.patch rename to mingw-w64-python-numpy/0004-fix-testsuite.patch diff --git a/mingw-w64-python3-numpy/0005-mincoming-stack-boundary-32bit-optimized-64bit.patch b/mingw-w64-python-numpy/0005-mincoming-stack-boundary-32bit-optimized-64bit.patch similarity index 100% rename from mingw-w64-python3-numpy/0005-mincoming-stack-boundary-32bit-optimized-64bit.patch rename to mingw-w64-python-numpy/0005-mincoming-stack-boundary-32bit-optimized-64bit.patch diff --git a/mingw-w64-python3-numpy/0006-disable-visualcompaq-for-mingw.patch b/mingw-w64-python-numpy/0006-disable-visualcompaq-for-mingw.patch similarity index 100% rename from mingw-w64-python3-numpy/0006-disable-visualcompaq-for-mingw.patch rename to mingw-w64-python-numpy/0006-disable-visualcompaq-for-mingw.patch diff --git a/mingw-w64-python3-numpy/0007-disable-64bit-experimental-warning.patch b/mingw-w64-python-numpy/0007-disable-64bit-experimental-warning.patch similarity index 100% rename from mingw-w64-python3-numpy/0007-disable-64bit-experimental-warning.patch rename to mingw-w64-python-numpy/0007-disable-64bit-experimental-warning.patch diff --git a/mingw-w64-python3-numpy/0008-mingw-gcc-doesnt-support-visibility.patch b/mingw-w64-python-numpy/0008-mingw-gcc-doesnt-support-visibility.patch similarity index 100% rename from mingw-w64-python3-numpy/0008-mingw-gcc-doesnt-support-visibility.patch rename to mingw-w64-python-numpy/0008-mingw-gcc-doesnt-support-visibility.patch diff --git a/mingw-w64-python3-numpy/0009-disable-old-mingw-stuff.patch b/mingw-w64-python-numpy/0009-disable-old-mingw-stuff.patch similarity index 100% rename from mingw-w64-python3-numpy/0009-disable-old-mingw-stuff.patch rename to mingw-w64-python-numpy/0009-disable-old-mingw-stuff.patch diff --git a/mingw-w64-python3-numpy/0010-mingw-inline-stuff.patch b/mingw-w64-python-numpy/0010-mingw-inline-stuff.patch similarity index 100% rename from mingw-w64-python3-numpy/0010-mingw-inline-stuff.patch rename to mingw-w64-python-numpy/0010-mingw-inline-stuff.patch diff --git a/mingw-w64-python3-numpy/PKGBUILD b/mingw-w64-python-numpy/PKGBUILD similarity index 100% rename from mingw-w64-python3-numpy/PKGBUILD rename to mingw-w64-python-numpy/PKGBUILD diff --git a/mingw-w64-python3-openpyxl/LICENSE b/mingw-w64-python-openpyxl/LICENSE similarity index 100% rename from mingw-w64-python3-openpyxl/LICENSE rename to mingw-w64-python-openpyxl/LICENSE diff --git a/mingw-w64-python3-openpyxl/PKGBUILD b/mingw-w64-python-openpyxl/PKGBUILD similarity index 100% rename from mingw-w64-python3-openpyxl/PKGBUILD rename to mingw-w64-python-openpyxl/PKGBUILD diff --git a/mingw-w64-python3-pandas/PKGBUILD b/mingw-w64-python-pandas/PKGBUILD similarity index 100% rename from mingw-w64-python3-pandas/PKGBUILD rename to mingw-w64-python-pandas/PKGBUILD diff --git a/mingw-w64-python3-path/PKGBUILD b/mingw-w64-python-path/PKGBUILD similarity index 100% rename from mingw-w64-python3-path/PKGBUILD rename to mingw-w64-python-path/PKGBUILD diff --git a/mingw-w64-python3-pylint/PKGBUILD b/mingw-w64-python-pylint/PKGBUILD similarity index 100% rename from mingw-w64-python3-pylint/PKGBUILD rename to mingw-w64-python-pylint/PKGBUILD diff --git a/mingw-w64-python3-pylint/pylint3-i686.install b/mingw-w64-python-pylint/pylint3-i686.install similarity index 100% rename from mingw-w64-python3-pylint/pylint3-i686.install rename to mingw-w64-python-pylint/pylint3-i686.install diff --git a/mingw-w64-python3-pylint/pylint3-x86_64.install b/mingw-w64-python-pylint/pylint3-x86_64.install similarity index 100% rename from mingw-w64-python3-pylint/pylint3-x86_64.install rename to mingw-w64-python-pylint/pylint3-x86_64.install diff --git a/mingw-w64-python3-pytest/PKGBUILD b/mingw-w64-python-pytest/PKGBUILD similarity index 100% rename from mingw-w64-python3-pytest/PKGBUILD rename to mingw-w64-python-pytest/PKGBUILD diff --git a/mingw-w64-python3-pytest/pytest3-i686.install b/mingw-w64-python-pytest/pytest3-i686.install similarity index 100% rename from mingw-w64-python3-pytest/pytest3-i686.install rename to mingw-w64-python-pytest/pytest3-i686.install diff --git a/mingw-w64-python3-pytest/pytest3-x86_64.install b/mingw-w64-python-pytest/pytest3-x86_64.install similarity index 100% rename from mingw-w64-python3-pytest/pytest3-x86_64.install rename to mingw-w64-python-pytest/pytest3-x86_64.install diff --git a/mingw-w64-python3-python_ics/PKGBUILD b/mingw-w64-python-python_ics/PKGBUILD similarity index 100% rename from mingw-w64-python3-python_ics/PKGBUILD rename to mingw-w64-python-python_ics/PKGBUILD diff --git a/mingw-w64-python3-python_ics/mingw-build.patch b/mingw-w64-python-python_ics/mingw-build.patch similarity index 100% rename from mingw-w64-python3-python_ics/mingw-build.patch rename to mingw-w64-python-python_ics/mingw-build.patch diff --git a/mingw-w64-python3-pywavelets/PKGBUILD b/mingw-w64-python-pywavelets/PKGBUILD similarity index 100% rename from mingw-w64-python3-pywavelets/PKGBUILD rename to mingw-w64-python-pywavelets/PKGBUILD diff --git a/mingw-w64-python3-scikit-learn/001-mingw-python-openmp-flag.patch b/mingw-w64-python-scikit-learn/001-mingw-python-openmp-flag.patch similarity index 100% rename from mingw-w64-python3-scikit-learn/001-mingw-python-openmp-flag.patch rename to mingw-w64-python-scikit-learn/001-mingw-python-openmp-flag.patch diff --git a/mingw-w64-python3-scikit-learn/002-openmp-cleanup-wait.patch b/mingw-w64-python-scikit-learn/002-openmp-cleanup-wait.patch similarity index 100% rename from mingw-w64-python3-scikit-learn/002-openmp-cleanup-wait.patch rename to mingw-w64-python-scikit-learn/002-openmp-cleanup-wait.patch diff --git a/mingw-w64-python3-scikit-learn/PKGBUILD b/mingw-w64-python-scikit-learn/PKGBUILD similarity index 100% rename from mingw-w64-python3-scikit-learn/PKGBUILD rename to mingw-w64-python-scikit-learn/PKGBUILD diff --git a/mingw-w64-python3-scipy/PKGBUILD b/mingw-w64-python-scipy/PKGBUILD similarity index 100% rename from mingw-w64-python3-scipy/PKGBUILD rename to mingw-w64-python-scipy/PKGBUILD diff --git a/mingw-w64-python3-sphinx/PKGBUILD b/mingw-w64-python-sphinx/PKGBUILD similarity index 96% rename from mingw-w64-python3-sphinx/PKGBUILD rename to mingw-w64-python-sphinx/PKGBUILD index 1a5db8b8b5..270fa8da16 100644 --- a/mingw-w64-python3-sphinx/PKGBUILD +++ b/mingw-w64-python-sphinx/PKGBUILD @@ -5,7 +5,7 @@ _pyname=Sphinx _realname=sphinx pkgbase=mingw-w64-python3-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="Python documentation generator (mingw-w64)" arch=('any') @@ -30,7 +30,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python3-babel" optdepends=("${MINGW_PACKAGE_PREFIX}-imagemagick: ext.imageconverter") checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest") source=("${_realname}-${pkgver}.tar.gz"::"https://pypi.org/packages/source/S/${_pyname}/${_pyname}-${pkgver}.tar.gz") -sha256sums=('0d586b0f8c2fc3cc6559c5e8fd6124628110514fda0e5d7c82e682d749d2e845') +sha256sums=('31088dfb95359384b1005619827eaee3056243798c62724fd3fa4b84ee4d71bd') build() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/mingw-w64-python3-sphinx/sphinx3-i686.install b/mingw-w64-python-sphinx/sphinx3-i686.install similarity index 100% rename from mingw-w64-python3-sphinx/sphinx3-i686.install rename to mingw-w64-python-sphinx/sphinx3-i686.install diff --git a/mingw-w64-python3-sphinx/sphinx3-x86_64.install b/mingw-w64-python-sphinx/sphinx3-x86_64.install similarity index 100% rename from mingw-w64-python3-sphinx/sphinx3-x86_64.install rename to mingw-w64-python-sphinx/sphinx3-x86_64.install diff --git a/mingw-w64-python3-sphinxcontrib-applehelp/PKGBUILD b/mingw-w64-python-sphinxcontrib-applehelp/PKGBUILD similarity index 100% rename from mingw-w64-python3-sphinxcontrib-applehelp/PKGBUILD rename to mingw-w64-python-sphinxcontrib-applehelp/PKGBUILD diff --git a/mingw-w64-python3-sphinxcontrib-devhelp/PKGBUILD b/mingw-w64-python-sphinxcontrib-devhelp/PKGBUILD similarity index 100% rename from mingw-w64-python3-sphinxcontrib-devhelp/PKGBUILD rename to mingw-w64-python-sphinxcontrib-devhelp/PKGBUILD diff --git a/mingw-w64-python3-sphinxcontrib-htmlhelp/PKGBUILD b/mingw-w64-python-sphinxcontrib-htmlhelp/PKGBUILD similarity index 100% rename from mingw-w64-python3-sphinxcontrib-htmlhelp/PKGBUILD rename to mingw-w64-python-sphinxcontrib-htmlhelp/PKGBUILD diff --git a/mingw-w64-python3-sphinxcontrib-jsmath/PKGBUILD b/mingw-w64-python-sphinxcontrib-jsmath/PKGBUILD similarity index 100% rename from mingw-w64-python3-sphinxcontrib-jsmath/PKGBUILD rename to mingw-w64-python-sphinxcontrib-jsmath/PKGBUILD diff --git a/mingw-w64-python3-sphinxcontrib-qthelp/PKGBUILD b/mingw-w64-python-sphinxcontrib-qthelp/PKGBUILD similarity index 100% rename from mingw-w64-python3-sphinxcontrib-qthelp/PKGBUILD rename to mingw-w64-python-sphinxcontrib-qthelp/PKGBUILD diff --git a/mingw-w64-python3-sphinxcontrib-serializinghtml/PKGBUILD b/mingw-w64-python-sphinxcontrib-serializinghtml/PKGBUILD similarity index 100% rename from mingw-w64-python3-sphinxcontrib-serializinghtml/PKGBUILD rename to mingw-w64-python-sphinxcontrib-serializinghtml/PKGBUILD diff --git a/mingw-w64-python3-testpath/PKGBUILD b/mingw-w64-python-testpath/PKGBUILD similarity index 100% rename from mingw-w64-python3-testpath/PKGBUILD rename to mingw-w64-python-testpath/PKGBUILD diff --git a/mingw-w64-python3-typed_ast/PKGBUILD b/mingw-w64-python-typed_ast/PKGBUILD similarity index 100% rename from mingw-w64-python3-typed_ast/PKGBUILD rename to mingw-w64-python-typed_ast/PKGBUILD diff --git a/mingw-w64-python3-udsoncan/PKGBUILD b/mingw-w64-python-udsoncan/PKGBUILD similarity index 100% rename from mingw-w64-python3-udsoncan/PKGBUILD rename to mingw-w64-python-udsoncan/PKGBUILD diff --git a/mingw-w64-python3-zeroconf/PKGBUILD b/mingw-w64-python-zeroconf/PKGBUILD similarity index 100% rename from mingw-w64-python3-zeroconf/PKGBUILD rename to mingw-w64-python-zeroconf/PKGBUILD diff --git a/mingw-w64-python3/0000-make-_sysconfigdata.py-relocatable.patch b/mingw-w64-python/0000-make-_sysconfigdata.py-relocatable.patch similarity index 100% rename from mingw-w64-python3/0000-make-_sysconfigdata.py-relocatable.patch rename to mingw-w64-python/0000-make-_sysconfigdata.py-relocatable.patch diff --git a/mingw-w64-python3/0001-fix-_nt_quote_args-using-subprocess-list2cmdline.patch b/mingw-w64-python/0001-fix-_nt_quote_args-using-subprocess-list2cmdline.patch similarity index 100% rename from mingw-w64-python3/0001-fix-_nt_quote_args-using-subprocess-list2cmdline.patch rename to mingw-w64-python/0001-fix-_nt_quote_args-using-subprocess-list2cmdline.patch diff --git a/mingw-w64-python3/0002-restore-setup-config.patch b/mingw-w64-python/0002-restore-setup-config.patch similarity index 100% rename from mingw-w64-python3/0002-restore-setup-config.patch rename to mingw-w64-python/0002-restore-setup-config.patch diff --git a/mingw-w64-python3/0100-MINGW-BASE-use-NT-thread-model.patch b/mingw-w64-python/0100-MINGW-BASE-use-NT-thread-model.patch similarity index 100% rename from mingw-w64-python3/0100-MINGW-BASE-use-NT-thread-model.patch rename to mingw-w64-python/0100-MINGW-BASE-use-NT-thread-model.patch diff --git a/mingw-w64-python3/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch b/mingw-w64-python/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch similarity index 100% rename from mingw-w64-python3/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch rename to mingw-w64-python/0110-MINGW-translate-gcc-internal-defines-to-python-platf.patch diff --git a/mingw-w64-python3/0130-MINGW-configure-MACHDEP-and-platform-for-build.patch b/mingw-w64-python/0130-MINGW-configure-MACHDEP-and-platform-for-build.patch similarity index 100% rename from mingw-w64-python3/0130-MINGW-configure-MACHDEP-and-platform-for-build.patch rename to mingw-w64-python/0130-MINGW-configure-MACHDEP-and-platform-for-build.patch diff --git a/mingw-w64-python3/0140-MINGW-preset-configure-defaults.patch b/mingw-w64-python/0140-MINGW-preset-configure-defaults.patch similarity index 100% rename from mingw-w64-python3/0140-MINGW-preset-configure-defaults.patch rename to mingw-w64-python/0140-MINGW-preset-configure-defaults.patch diff --git a/mingw-w64-python3/0150-MINGW-configure-largefile-support-for-windows-builds.patch b/mingw-w64-python/0150-MINGW-configure-largefile-support-for-windows-builds.patch similarity index 100% rename from mingw-w64-python3/0150-MINGW-configure-largefile-support-for-windows-builds.patch rename to mingw-w64-python/0150-MINGW-configure-largefile-support-for-windows-builds.patch diff --git a/mingw-w64-python3/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch b/mingw-w64-python/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch similarity index 100% rename from mingw-w64-python3/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch rename to mingw-w64-python/0170-MINGW-add-srcdir-PC-to-CPPFLAGS.patch diff --git a/mingw-w64-python3/0180-MINGW-init-system-calls.patch b/mingw-w64-python/0180-MINGW-init-system-calls.patch similarity index 100% rename from mingw-w64-python3/0180-MINGW-init-system-calls.patch rename to mingw-w64-python/0180-MINGW-init-system-calls.patch diff --git a/mingw-w64-python3/0200-MINGW-build-in-windows-modules-winreg.patch b/mingw-w64-python/0200-MINGW-build-in-windows-modules-winreg.patch similarity index 100% rename from mingw-w64-python3/0200-MINGW-build-in-windows-modules-winreg.patch rename to mingw-w64-python/0200-MINGW-build-in-windows-modules-winreg.patch diff --git a/mingw-w64-python3/0210-MINGW-determine-if-pwdmodule-should-be-used.patch b/mingw-w64-python/0210-MINGW-determine-if-pwdmodule-should-be-used.patch similarity index 100% rename from mingw-w64-python3/0210-MINGW-determine-if-pwdmodule-should-be-used.patch rename to mingw-w64-python/0210-MINGW-determine-if-pwdmodule-should-be-used.patch diff --git a/mingw-w64-python3/0250-MINGW-compiler-customize-mingw-cygwin-compilers.patch b/mingw-w64-python/0250-MINGW-compiler-customize-mingw-cygwin-compilers.patch similarity index 100% rename from mingw-w64-python3/0250-MINGW-compiler-customize-mingw-cygwin-compilers.patch rename to mingw-w64-python/0250-MINGW-compiler-customize-mingw-cygwin-compilers.patch diff --git a/mingw-w64-python3/0260-MINGW-compiler-enable-new-dtags.patch b/mingw-w64-python/0260-MINGW-compiler-enable-new-dtags.patch similarity index 100% rename from mingw-w64-python3/0260-MINGW-compiler-enable-new-dtags.patch rename to mingw-w64-python/0260-MINGW-compiler-enable-new-dtags.patch diff --git a/mingw-w64-python3/0290-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch b/mingw-w64-python/0290-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch similarity index 100% rename from mingw-w64-python3/0290-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch rename to mingw-w64-python/0290-issue6672-v2-Add-Mingw-recognition-to-pyport.h-to-al.patch diff --git a/mingw-w64-python3/0300-MINGW-configure-for-shared-build.patch b/mingw-w64-python/0300-MINGW-configure-for-shared-build.patch similarity index 100% rename from mingw-w64-python3/0300-MINGW-configure-for-shared-build.patch rename to mingw-w64-python/0300-MINGW-configure-for-shared-build.patch diff --git a/mingw-w64-python3/0310-MINGW-dynamic-loading-support.patch b/mingw-w64-python/0310-MINGW-dynamic-loading-support.patch similarity index 100% rename from mingw-w64-python3/0310-MINGW-dynamic-loading-support.patch rename to mingw-w64-python/0310-MINGW-dynamic-loading-support.patch diff --git a/mingw-w64-python3/0330-MINGW-ignore-main-program-for-frozen-scripts.patch b/mingw-w64-python/0330-MINGW-ignore-main-program-for-frozen-scripts.patch similarity index 100% rename from mingw-w64-python3/0330-MINGW-ignore-main-program-for-frozen-scripts.patch rename to mingw-w64-python/0330-MINGW-ignore-main-program-for-frozen-scripts.patch diff --git a/mingw-w64-python3/0350-MINGW-setup-_multiprocessing-module.patch b/mingw-w64-python/0350-MINGW-setup-_multiprocessing-module.patch similarity index 100% rename from mingw-w64-python3/0350-MINGW-setup-_multiprocessing-module.patch rename to mingw-w64-python/0350-MINGW-setup-_multiprocessing-module.patch diff --git a/mingw-w64-python3/0360-MINGW-setup-select-module.patch b/mingw-w64-python/0360-MINGW-setup-select-module.patch similarity index 100% rename from mingw-w64-python3/0360-MINGW-setup-select-module.patch rename to mingw-w64-python/0360-MINGW-setup-select-module.patch diff --git a/mingw-w64-python3/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch b/mingw-w64-python/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch similarity index 100% rename from mingw-w64-python3/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch rename to mingw-w64-python/0370-MINGW-setup-_ctypes-module-with-system-libffi.patch diff --git a/mingw-w64-python3/0380-MINGW-defect-winsock2-and-setup-_socket-module.patch b/mingw-w64-python/0380-MINGW-defect-winsock2-and-setup-_socket-module.patch similarity index 100% rename from mingw-w64-python3/0380-MINGW-defect-winsock2-and-setup-_socket-module.patch rename to mingw-w64-python/0380-MINGW-defect-winsock2-and-setup-_socket-module.patch diff --git a/mingw-w64-python3/0390-MINGW-exclude-unix-only-modules.patch b/mingw-w64-python/0390-MINGW-exclude-unix-only-modules.patch similarity index 100% rename from mingw-w64-python3/0390-MINGW-exclude-unix-only-modules.patch rename to mingw-w64-python/0390-MINGW-exclude-unix-only-modules.patch diff --git a/mingw-w64-python3/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch b/mingw-w64-python/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch similarity index 100% rename from mingw-w64-python3/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch rename to mingw-w64-python/0400-MINGW-setup-msvcrt-and-_winapi-modules.patch diff --git a/mingw-w64-python3/0410-MINGW-build-extensions-with-GCC.patch b/mingw-w64-python/0410-MINGW-build-extensions-with-GCC.patch similarity index 100% rename from mingw-w64-python3/0410-MINGW-build-extensions-with-GCC.patch rename to mingw-w64-python/0410-MINGW-build-extensions-with-GCC.patch diff --git a/mingw-w64-python3/0420-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch b/mingw-w64-python/0420-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch similarity index 100% rename from mingw-w64-python3/0420-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch rename to mingw-w64-python/0420-MINGW-use-Mingw32CCompiler-as-default-compiler-for-m.patch diff --git a/mingw-w64-python3/0430-MINGW-find-import-library.patch b/mingw-w64-python/0430-MINGW-find-import-library.patch similarity index 100% rename from mingw-w64-python3/0430-MINGW-find-import-library.patch rename to mingw-w64-python/0430-MINGW-find-import-library.patch diff --git a/mingw-w64-python3/0440-MINGW-setup-_ssl-module.patch b/mingw-w64-python/0440-MINGW-setup-_ssl-module.patch similarity index 100% rename from mingw-w64-python3/0440-MINGW-setup-_ssl-module.patch rename to mingw-w64-python/0440-MINGW-setup-_ssl-module.patch diff --git a/mingw-w64-python3/0460-MINGW-generalization-of-posix-build-in-sysconfig.py.patch b/mingw-w64-python/0460-MINGW-generalization-of-posix-build-in-sysconfig.py.patch similarity index 100% rename from mingw-w64-python3/0460-MINGW-generalization-of-posix-build-in-sysconfig.py.patch rename to mingw-w64-python/0460-MINGW-generalization-of-posix-build-in-sysconfig.py.patch diff --git a/mingw-w64-python3/0462-MINGW-support-stdcall-without-underscore.patch b/mingw-w64-python/0462-MINGW-support-stdcall-without-underscore.patch similarity index 100% rename from mingw-w64-python3/0462-MINGW-support-stdcall-without-underscore.patch rename to mingw-w64-python/0462-MINGW-support-stdcall-without-underscore.patch diff --git a/mingw-w64-python3/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch b/mingw-w64-python/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch similarity index 100% rename from mingw-w64-python3/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch rename to mingw-w64-python/0464-use-replace-instead-rename-to-avoid-failure-on-windo.patch diff --git a/mingw-w64-python3/0470-MINGW-avoid-circular-dependency-from-time-module-dur.patch b/mingw-w64-python/0470-MINGW-avoid-circular-dependency-from-time-module-dur.patch similarity index 100% rename from mingw-w64-python3/0470-MINGW-avoid-circular-dependency-from-time-module-dur.patch rename to mingw-w64-python/0470-MINGW-avoid-circular-dependency-from-time-module-dur.patch diff --git a/mingw-w64-python3/0480-MINGW-generalization-of-posix-build-in-distutils-sys.patch b/mingw-w64-python/0480-MINGW-generalization-of-posix-build-in-distutils-sys.patch similarity index 100% rename from mingw-w64-python3/0480-MINGW-generalization-of-posix-build-in-distutils-sys.patch rename to mingw-w64-python/0480-MINGW-generalization-of-posix-build-in-distutils-sys.patch diff --git a/mingw-w64-python3/0490-MINGW-customize-site.patch b/mingw-w64-python/0490-MINGW-customize-site.patch similarity index 100% rename from mingw-w64-python3/0490-MINGW-customize-site.patch rename to mingw-w64-python/0490-MINGW-customize-site.patch diff --git a/mingw-w64-python3/0500-add-python-config-sh.patch b/mingw-w64-python/0500-add-python-config-sh.patch similarity index 100% rename from mingw-w64-python3/0500-add-python-config-sh.patch rename to mingw-w64-python/0500-add-python-config-sh.patch diff --git a/mingw-w64-python3/0510-cross-darwin-feature.patch b/mingw-w64-python/0510-cross-darwin-feature.patch similarity index 100% rename from mingw-w64-python3/0510-cross-darwin-feature.patch rename to mingw-w64-python/0510-cross-darwin-feature.patch diff --git a/mingw-w64-python3/0520-py3k-mingw-ntthreads-vs-pthreads.patch b/mingw-w64-python/0520-py3k-mingw-ntthreads-vs-pthreads.patch similarity index 100% rename from mingw-w64-python3/0520-py3k-mingw-ntthreads-vs-pthreads.patch rename to mingw-w64-python/0520-py3k-mingw-ntthreads-vs-pthreads.patch diff --git a/mingw-w64-python3/0530-mingw-system-libffi.patch b/mingw-w64-python/0530-mingw-system-libffi.patch similarity index 100% rename from mingw-w64-python3/0530-mingw-system-libffi.patch rename to mingw-w64-python/0530-mingw-system-libffi.patch diff --git a/mingw-w64-python3/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch b/mingw-w64-python/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch similarity index 100% rename from mingw-w64-python3/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch rename to mingw-w64-python/0555-msys-mingw-prefer-unix-sep-if-MSYSTEM.patch diff --git a/mingw-w64-python3/0560-mingw-use-posix-getpath.patch b/mingw-w64-python/0560-mingw-use-posix-getpath.patch similarity index 100% rename from mingw-w64-python3/0560-mingw-use-posix-getpath.patch rename to mingw-w64-python/0560-mingw-use-posix-getpath.patch diff --git a/mingw-w64-python3/0565-mingw-add-ModuleFileName-dir-to-PATH.patch b/mingw-w64-python/0565-mingw-add-ModuleFileName-dir-to-PATH.patch similarity index 100% rename from mingw-w64-python3/0565-mingw-add-ModuleFileName-dir-to-PATH.patch rename to mingw-w64-python/0565-mingw-add-ModuleFileName-dir-to-PATH.patch diff --git a/mingw-w64-python3/0570-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch b/mingw-w64-python/0570-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch similarity index 100% rename from mingw-w64-python3/0570-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch rename to mingw-w64-python/0570-mingw-add-BUILDIN_WIN32_MODULEs-time-msvcrt.patch diff --git a/mingw-w64-python3/0610-msys-cygwin-semi-native-build-sysconfig.patch b/mingw-w64-python/0610-msys-cygwin-semi-native-build-sysconfig.patch similarity index 100% rename from mingw-w64-python3/0610-msys-cygwin-semi-native-build-sysconfig.patch rename to mingw-w64-python/0610-msys-cygwin-semi-native-build-sysconfig.patch diff --git a/mingw-w64-python3/0620-mingw-sysconfig-like-posix.patch b/mingw-w64-python/0620-mingw-sysconfig-like-posix.patch similarity index 100% rename from mingw-w64-python3/0620-mingw-sysconfig-like-posix.patch rename to mingw-w64-python/0620-mingw-sysconfig-like-posix.patch diff --git a/mingw-w64-python3/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch b/mingw-w64-python/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch similarity index 100% rename from mingw-w64-python3/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch rename to mingw-w64-python/0630-mingw-_winapi_as_builtin_for_Popen_in_cygwinccompiler.patch diff --git a/mingw-w64-python3/0640-mingw-x86_64-size_t-format-specifier-pid_t.patch b/mingw-w64-python/0640-mingw-x86_64-size_t-format-specifier-pid_t.patch similarity index 100% rename from mingw-w64-python3/0640-mingw-x86_64-size_t-format-specifier-pid_t.patch rename to mingw-w64-python/0640-mingw-x86_64-size_t-format-specifier-pid_t.patch diff --git a/mingw-w64-python3/0650-cross-dont-add-multiarch-paths-if-cross-compiling.patch b/mingw-w64-python/0650-cross-dont-add-multiarch-paths-if-cross-compiling.patch similarity index 100% rename from mingw-w64-python3/0650-cross-dont-add-multiarch-paths-if-cross-compiling.patch rename to mingw-w64-python/0650-cross-dont-add-multiarch-paths-if-cross-compiling.patch diff --git a/mingw-w64-python3/0660-mingw-use-backslashes-in-compileall-py.patch b/mingw-w64-python/0660-mingw-use-backslashes-in-compileall-py.patch similarity index 100% rename from mingw-w64-python3/0660-mingw-use-backslashes-in-compileall-py.patch rename to mingw-w64-python/0660-mingw-use-backslashes-in-compileall-py.patch diff --git a/mingw-w64-python3/0670-msys-convert_path-fix-and-root-hack.patch b/mingw-w64-python/0670-msys-convert_path-fix-and-root-hack.patch similarity index 100% rename from mingw-w64-python3/0670-msys-convert_path-fix-and-root-hack.patch rename to mingw-w64-python/0670-msys-convert_path-fix-and-root-hack.patch diff --git a/mingw-w64-python3/0690-allow-static-tcltk.patch b/mingw-w64-python/0690-allow-static-tcltk.patch similarity index 100% rename from mingw-w64-python3/0690-allow-static-tcltk.patch rename to mingw-w64-python/0690-allow-static-tcltk.patch diff --git a/mingw-w64-python3/0720-mingw-pdcurses_ISPAD.patch b/mingw-w64-python/0720-mingw-pdcurses_ISPAD.patch similarity index 100% rename from mingw-w64-python3/0720-mingw-pdcurses_ISPAD.patch rename to mingw-w64-python/0720-mingw-pdcurses_ISPAD.patch diff --git a/mingw-w64-python3/0740-grammar-fixes.patch b/mingw-w64-python/0740-grammar-fixes.patch similarity index 100% rename from mingw-w64-python3/0740-grammar-fixes.patch rename to mingw-w64-python/0740-grammar-fixes.patch diff --git a/mingw-w64-python3/0750-builddir-fixes.patch b/mingw-w64-python/0750-builddir-fixes.patch similarity index 100% rename from mingw-w64-python3/0750-builddir-fixes.patch rename to mingw-w64-python/0750-builddir-fixes.patch diff --git a/mingw-w64-python3/0760-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python/0760-msys-monkeypatch-os-system-via-sh-exe.patch similarity index 100% rename from mingw-w64-python3/0760-msys-monkeypatch-os-system-via-sh-exe.patch rename to mingw-w64-python/0760-msys-monkeypatch-os-system-via-sh-exe.patch diff --git a/mingw-w64-python3/0770-msys-replace-slashes-used-in-io-redirection.patch b/mingw-w64-python/0770-msys-replace-slashes-used-in-io-redirection.patch similarity index 100% rename from mingw-w64-python3/0770-msys-replace-slashes-used-in-io-redirection.patch rename to mingw-w64-python/0770-msys-replace-slashes-used-in-io-redirection.patch diff --git a/mingw-w64-python3/0800-mingw-install-layout-as-posix.patch b/mingw-w64-python/0800-mingw-install-layout-as-posix.patch similarity index 100% rename from mingw-w64-python3/0800-mingw-install-layout-as-posix.patch rename to mingw-w64-python/0800-mingw-install-layout-as-posix.patch diff --git a/mingw-w64-python3/0810-remove_path_max.default.patch b/mingw-w64-python/0810-remove_path_max.default.patch similarity index 100% rename from mingw-w64-python3/0810-remove_path_max.default.patch rename to mingw-w64-python/0810-remove_path_max.default.patch diff --git a/mingw-w64-python3/0820-dont-link-with-gettext.patch b/mingw-w64-python/0820-dont-link-with-gettext.patch similarity index 100% rename from mingw-w64-python3/0820-dont-link-with-gettext.patch rename to mingw-w64-python/0820-dont-link-with-gettext.patch diff --git a/mingw-w64-python3/0830-ctypes-python-dll.patch b/mingw-w64-python/0830-ctypes-python-dll.patch similarity index 100% rename from mingw-w64-python3/0830-ctypes-python-dll.patch rename to mingw-w64-python/0830-ctypes-python-dll.patch diff --git a/mingw-w64-python3/0840-gdbm-module-includes.patch b/mingw-w64-python/0840-gdbm-module-includes.patch similarity index 100% rename from mingw-w64-python3/0840-gdbm-module-includes.patch rename to mingw-w64-python/0840-gdbm-module-includes.patch diff --git a/mingw-w64-python3/0850-use-gnu_printf-in-format.patch b/mingw-w64-python/0850-use-gnu_printf-in-format.patch similarity index 100% rename from mingw-w64-python3/0850-use-gnu_printf-in-format.patch rename to mingw-w64-python/0850-use-gnu_printf-in-format.patch diff --git a/mingw-w64-python3/0870-mingw-fix-ssl-dont-use-enum_certificates.patch b/mingw-w64-python/0870-mingw-fix-ssl-dont-use-enum_certificates.patch similarity index 100% rename from mingw-w64-python3/0870-mingw-fix-ssl-dont-use-enum_certificates.patch rename to mingw-w64-python/0870-mingw-fix-ssl-dont-use-enum_certificates.patch diff --git a/mingw-w64-python3/0890-mingw-build-optimized-ext.patch b/mingw-w64-python/0890-mingw-build-optimized-ext.patch similarity index 100% rename from mingw-w64-python3/0890-mingw-build-optimized-ext.patch rename to mingw-w64-python/0890-mingw-build-optimized-ext.patch diff --git a/mingw-w64-python3/0900-cygwinccompiler-dont-strip-modules-if-pydebug.patch b/mingw-w64-python/0900-cygwinccompiler-dont-strip-modules-if-pydebug.patch similarity index 100% rename from mingw-w64-python3/0900-cygwinccompiler-dont-strip-modules-if-pydebug.patch rename to mingw-w64-python/0900-cygwinccompiler-dont-strip-modules-if-pydebug.patch diff --git a/mingw-w64-python3/0910-fix-using-dllhandle-and-winver-mingw.patch b/mingw-w64-python/0910-fix-using-dllhandle-and-winver-mingw.patch similarity index 100% rename from mingw-w64-python3/0910-fix-using-dllhandle-and-winver-mingw.patch rename to mingw-w64-python/0910-fix-using-dllhandle-and-winver-mingw.patch diff --git a/mingw-w64-python3/0920-mingw-add-LIBPL-to-library-dirs.patch b/mingw-w64-python/0920-mingw-add-LIBPL-to-library-dirs.patch similarity index 100% rename from mingw-w64-python3/0920-mingw-add-LIBPL-to-library-dirs.patch rename to mingw-w64-python/0920-mingw-add-LIBPL-to-library-dirs.patch diff --git a/mingw-w64-python3/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch b/mingw-w64-python/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch similarity index 100% rename from mingw-w64-python3/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch rename to mingw-w64-python/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch diff --git a/mingw-w64-python3/0990-MINGW-link-with-additional-library.patch b/mingw-w64-python/0990-MINGW-link-with-additional-library.patch similarity index 100% rename from mingw-w64-python3/0990-MINGW-link-with-additional-library.patch rename to mingw-w64-python/0990-MINGW-link-with-additional-library.patch diff --git a/mingw-w64-python3/1010-install-msilib.patch b/mingw-w64-python/1010-install-msilib.patch similarity index 100% rename from mingw-w64-python3/1010-install-msilib.patch rename to mingw-w64-python/1010-install-msilib.patch diff --git a/mingw-w64-python3/1060-dont-include-system-ncurses-path.patch b/mingw-w64-python/1060-dont-include-system-ncurses-path.patch similarity index 100% rename from mingw-w64-python3/1060-dont-include-system-ncurses-path.patch rename to mingw-w64-python/1060-dont-include-system-ncurses-path.patch diff --git a/mingw-w64-python3/1620-fix-signal-module-build.patch b/mingw-w64-python/1620-fix-signal-module-build.patch similarity index 100% rename from mingw-w64-python3/1620-fix-signal-module-build.patch rename to mingw-w64-python/1620-fix-signal-module-build.patch diff --git a/mingw-w64-python3/1630-build-winconsoleio.patch b/mingw-w64-python/1630-build-winconsoleio.patch similarity index 100% rename from mingw-w64-python3/1630-build-winconsoleio.patch rename to mingw-w64-python/1630-build-winconsoleio.patch diff --git a/mingw-w64-python3/1650-expose-sem_unlink.patch b/mingw-w64-python/1650-expose-sem_unlink.patch similarity index 100% rename from mingw-w64-python3/1650-expose-sem_unlink.patch rename to mingw-w64-python/1650-expose-sem_unlink.patch diff --git a/mingw-w64-python3/1700-cygpty-isatty.patch b/mingw-w64-python/1700-cygpty-isatty.patch similarity index 100% rename from mingw-w64-python3/1700-cygpty-isatty.patch rename to mingw-w64-python/1700-cygpty-isatty.patch diff --git a/mingw-w64-python3/1701-disable-broken-gdbm-module.patch b/mingw-w64-python/1701-disable-broken-gdbm-module.patch similarity index 100% rename from mingw-w64-python3/1701-disable-broken-gdbm-module.patch rename to mingw-w64-python/1701-disable-broken-gdbm-module.patch diff --git a/mingw-w64-python3/1800-link-win-resource-files-and-build-pythonw.patch b/mingw-w64-python/1800-link-win-resource-files-and-build-pythonw.patch similarity index 100% rename from mingw-w64-python3/1800-link-win-resource-files-and-build-pythonw.patch rename to mingw-w64-python/1800-link-win-resource-files-and-build-pythonw.patch diff --git a/mingw-w64-python3/1810-3.7-mpdec-mingw.patch b/mingw-w64-python/1810-3.7-mpdec-mingw.patch similarity index 100% rename from mingw-w64-python3/1810-3.7-mpdec-mingw.patch rename to mingw-w64-python/1810-3.7-mpdec-mingw.patch diff --git a/mingw-w64-python3/1830-mingw-implement-setenv-for-PY_COERCE_C_LOCALE.patch b/mingw-w64-python/1830-mingw-implement-setenv-for-PY_COERCE_C_LOCALE.patch similarity index 100% rename from mingw-w64-python3/1830-mingw-implement-setenv-for-PY_COERCE_C_LOCALE.patch rename to mingw-w64-python/1830-mingw-implement-setenv-for-PY_COERCE_C_LOCALE.patch diff --git a/mingw-w64-python3/1850-disable-readline.patch b/mingw-w64-python/1850-disable-readline.patch similarity index 100% rename from mingw-w64-python3/1850-disable-readline.patch rename to mingw-w64-python/1850-disable-readline.patch diff --git a/mingw-w64-python3/1860-fix-isselectable.patch b/mingw-w64-python/1860-fix-isselectable.patch similarity index 100% rename from mingw-w64-python3/1860-fix-isselectable.patch rename to mingw-w64-python/1860-fix-isselectable.patch diff --git a/mingw-w64-python3/1870-use-_wcsnicmp-instead-wcsncasecmp.patch b/mingw-w64-python/1870-use-_wcsnicmp-instead-wcsncasecmp.patch similarity index 100% rename from mingw-w64-python3/1870-use-_wcsnicmp-instead-wcsncasecmp.patch rename to mingw-w64-python/1870-use-_wcsnicmp-instead-wcsncasecmp.patch diff --git a/mingw-w64-python3/1880-make-default-python.patch b/mingw-w64-python/1880-make-default-python.patch similarity index 100% rename from mingw-w64-python3/1880-make-default-python.patch rename to mingw-w64-python/1880-make-default-python.patch diff --git a/mingw-w64-python3/1890-_xxsubinterpretersmodule.patch b/mingw-w64-python/1890-_xxsubinterpretersmodule.patch similarity index 100% rename from mingw-w64-python3/1890-_xxsubinterpretersmodule.patch rename to mingw-w64-python/1890-_xxsubinterpretersmodule.patch diff --git a/mingw-w64-python3/2010-configure-have-inet-pton.patch b/mingw-w64-python/2010-configure-have-inet-pton.patch similarity index 100% rename from mingw-w64-python3/2010-configure-have-inet-pton.patch rename to mingw-w64-python/2010-configure-have-inet-pton.patch diff --git a/mingw-w64-python3/2030-fix-msvc9-import.patch b/mingw-w64-python/2030-fix-msvc9-import.patch similarity index 100% rename from mingw-w64-python3/2030-fix-msvc9-import.patch rename to mingw-w64-python/2030-fix-msvc9-import.patch diff --git a/mingw-w64-python3/2050-undo-venv-redirector.patch b/mingw-w64-python/2050-undo-venv-redirector.patch similarity index 100% rename from mingw-w64-python3/2050-undo-venv-redirector.patch rename to mingw-w64-python/2050-undo-venv-redirector.patch diff --git a/mingw-w64-python3/2051-set-venv-activate-path-unix.patch b/mingw-w64-python/2051-set-venv-activate-path-unix.patch similarity index 100% rename from mingw-w64-python3/2051-set-venv-activate-path-unix.patch rename to mingw-w64-python/2051-set-venv-activate-path-unix.patch diff --git a/mingw-w64-python3/2052-venv-remove-msys-from-env-and-add-exe-prefix.patch b/mingw-w64-python/2052-venv-remove-msys-from-env-and-add-exe-prefix.patch similarity index 100% rename from mingw-w64-python3/2052-venv-remove-msys-from-env-and-add-exe-prefix.patch rename to mingw-w64-python/2052-venv-remove-msys-from-env-and-add-exe-prefix.patch diff --git a/mingw-w64-python3/2060-pass-gen-profile-ldflags.patch b/mingw-w64-python/2060-pass-gen-profile-ldflags.patch similarity index 100% rename from mingw-w64-python3/2060-pass-gen-profile-ldflags.patch rename to mingw-w64-python/2060-pass-gen-profile-ldflags.patch diff --git a/mingw-w64-python3/2070-distutils-add-windmc-to-cygwinccompiler.patch b/mingw-w64-python/2070-distutils-add-windmc-to-cygwinccompiler.patch similarity index 100% rename from mingw-w64-python3/2070-distutils-add-windmc-to-cygwinccompiler.patch rename to mingw-w64-python/2070-distutils-add-windmc-to-cygwinccompiler.patch diff --git a/mingw-w64-python3/2080-pkg-config-windows-must-link-ext-with-python-lib.patch b/mingw-w64-python/2080-pkg-config-windows-must-link-ext-with-python-lib.patch similarity index 100% rename from mingw-w64-python3/2080-pkg-config-windows-must-link-ext-with-python-lib.patch rename to mingw-w64-python/2080-pkg-config-windows-must-link-ext-with-python-lib.patch diff --git a/mingw-w64-python3/3000-importlib-bootstrap-path-sep.patch b/mingw-w64-python/3000-importlib-bootstrap-path-sep.patch similarity index 100% rename from mingw-w64-python3/3000-importlib-bootstrap-path-sep.patch rename to mingw-w64-python/3000-importlib-bootstrap-path-sep.patch diff --git a/mingw-w64-python3/5000-warnings-fixes.patch b/mingw-w64-python/5000-warnings-fixes.patch similarity index 100% rename from mingw-w64-python3/5000-warnings-fixes.patch rename to mingw-w64-python/5000-warnings-fixes.patch diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python/PKGBUILD similarity index 100% rename from mingw-w64-python3/PKGBUILD rename to mingw-w64-python/PKGBUILD diff --git a/mingw-w64-python3/smoketests.py b/mingw-w64-python/smoketests.py similarity index 100% rename from mingw-w64-python3/smoketests.py rename to mingw-w64-python/smoketests.py