Date: Monday, November 9, 2020 @ 10:07:33 Author: foutrelis Revision: 399662
Prepare for Python 3.9 rebuild Modified: boost/trunk/PKGBUILD clang/trunk/PKGBUILD deluge/trunk/PKGBUILD git-review/trunk/PKGBUILD gpgme/trunk/PKGBUILD libreoffice-fresh/trunk/PKGBUILD libreoffice-still/trunk/PKGBUILD libvoikko/trunk/PKGBUILD libxml2/trunk/PKGBUILD pyalpm/trunk/PKGBUILD python-feedparser/trunk/PKGBUILD python-isort/trunk/PKGBUILD python-numpy/trunk/PKGBUILD python-pip/trunk/PKGBUILD python-pycurl/trunk/PKGBUILD python-wrapt/trunk/PKGBUILD python-zope-interface/trunk/PKGBUILD subversion/trunk/PKGBUILD --------------------------------------+ boost/trunk/PKGBUILD | 6 +++--- clang/trunk/PKGBUILD | 2 +- deluge/trunk/PKGBUILD | 2 +- git-review/trunk/PKGBUILD | 2 +- gpgme/trunk/PKGBUILD | 6 +++--- libreoffice-fresh/trunk/PKGBUILD | 6 +++--- libreoffice-still/trunk/PKGBUILD | 6 +++--- libvoikko/trunk/PKGBUILD | 4 ++-- libxml2/trunk/PKGBUILD | 4 ++-- pyalpm/trunk/PKGBUILD | 2 +- python-feedparser/trunk/PKGBUILD | 8 ++++---- python-isort/trunk/PKGBUILD | 2 +- python-numpy/trunk/PKGBUILD | 2 +- python-pip/trunk/PKGBUILD | 6 +++--- python-pycurl/trunk/PKGBUILD | 2 +- python-wrapt/trunk/PKGBUILD | 2 +- python-zope-interface/trunk/PKGBUILD | 2 +- subversion/trunk/PKGBUILD | 8 ++++---- 18 files changed, 36 insertions(+), 36 deletions(-) Modified: boost/trunk/PKGBUILD =================================================================== --- boost/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ boost/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -79,7 +79,7 @@ runtime-link=shared \ link=shared,static \ toolset=gcc \ - python=3.8 \ + python=3.9 \ cflags="${CPPFLAGS} ${CFLAGS} -fPIC -O3" \ cxxflags="${CPPFLAGS} ${CXXFLAGS} -std=c++14 -fPIC -O3" \ linkflags="${LDFLAGS}" \ @@ -126,9 +126,9 @@ libboost_locale.so libboost_log.so libboost_log_setup.so libboost_math_c99.so libboost_math_c99f.so libboost_math_c99l.so libboost_math_tr1.so libboost_math_tr1f.so libboost_math_tr1l.so - libboost_mpi.so libboost_numpy27.so libboost_numpy38.so + libboost_mpi.so libboost_numpy27.so libboost_numpy39.so libboost_prg_exec_monitor.so libboost_program_options.so - libboost_python27.so libboost_python38.so libboost_random.so + libboost_python27.so libboost_python39.so libboost_random.so libboost_regex.so libboost_serialization.so libboost_stacktrace_addr2line.so libboost_stacktrace_basic.so libboost_stacktrace_noop.so libboost_system.so libboost_thread.so Modified: clang/trunk/PKGBUILD =================================================================== --- clang/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ clang/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -120,7 +120,7 @@ sed -i 's|libexec|lib/clang|' "$pkgdir/usr/bin/scan-build" # Install Python bindings - for _py in 2.7 3.8; do + for _py in 2.7 3.9; do install -d "$pkgdir/usr/lib/python$_py/site-packages" cp -a ../bindings/python/clang "$pkgdir/usr/lib/python$_py/site-packages/" _python${_py%%.*}_optimize "$pkgdir/usr/lib/python$_py" Modified: deluge/trunk/PKGBUILD =================================================================== --- deluge/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ deluge/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -94,7 +94,7 @@ _pick gtk usr/bin/deluge-gtk usr/share/man/man1/deluge-gtk.1 _pick gtk usr/share/{appdata,applications,icons,pixmaps} - _pick gtk usr/lib/python3.8/site-packages/deluge/ui/gtk3 + _pick gtk usr/lib/python3.9/site-packages/deluge/ui/gtk3 } package_deluge-gtk() { Modified: git-review/trunk/PKGBUILD =================================================================== --- git-review/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ git-review/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -46,7 +46,7 @@ python setup.py install --root="$PWD/tmp_install" --optimize=1 python -m git_review.tests.prepare - PYTHONPATH="$PWD/tmp_install/usr/lib/python3.8/site-packages:$PYTHONPATH" PATH="$PWD/tmp_install/usr/bin:$PATH" stestr run || warning "Tests failed" + PYTHONPATH="$PWD/tmp_install/usr/lib/python3.9/site-packages:$PYTHONPATH" PATH="$PWD/tmp_install/usr/bin:$PATH" stestr run || warning "Tests failed" } package() { Modified: gpgme/trunk/PKGBUILD =================================================================== --- gpgme/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ gpgme/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -6,7 +6,7 @@ pkgname=(gpgme qgpgme python-gpgme) pkgver=1.14.0 pkgrel=1 -_python_ver=3.8 +_python_ver=3.9 pkgdesc="A C wrapper library for GnuPG" arch=('x86_64') url='https://www.gnupg.org/related_software/gpgme/' @@ -31,9 +31,9 @@ # ensure reproducibility of .pyc files touch -d @$SOURCE_DATE_EPOCH lang/python/version.py touch -d @$SOURCE_DATE_EPOCH lang/python/python${_python_ver}-gpg/lib.linux-x86_64-${_python_ver}/gpg/gpgme.py - + # .pyc files will be created if check() is used - generate them here - + } check() { Modified: libreoffice-fresh/trunk/PKGBUILD =================================================================== --- libreoffice-fresh/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ libreoffice-fresh/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -328,11 +328,11 @@ install -m644 "${srcdir}"/libreoffice-fresh.{sh,csh} "${pkgdir}"/etc/profile.d/ # make pyuno find its modules - install -dm755 "${pkgdir}"/usr/lib/python3.8/site-packages + install -dm755 "${pkgdir}"/usr/lib/python3.9/site-packages ln -svf /usr/lib/libreoffice/program/uno.py \ - "${pkgdir}"/usr/lib/python3.8/site-packages/uno.py + "${pkgdir}"/usr/lib/python3.9/site-packages/uno.py ln -svf /usr/lib/libreoffice/program/unohelper.py \ - "${pkgdir}"/usr/lib/python3.8/site-packages/unohelper.py + "${pkgdir}"/usr/lib/python3.9/site-packages/unohelper.py # add a symlink required for gnome-documents; FS#51887 # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html Modified: libreoffice-still/trunk/PKGBUILD =================================================================== --- libreoffice-still/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ libreoffice-still/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -319,11 +319,11 @@ install -m644 "${srcdir}"/libreoffice-still.{sh,csh} "${pkgdir}"/etc/profile.d/ # make pyuno find its modules - install -dm755 "${pkgdir}"/usr/lib/python3.8/site-packages + install -dm755 "${pkgdir}"/usr/lib/python3.9/site-packages ln -svf /usr/lib/libreoffice/program/uno.py \ - "${pkgdir}"/usr/lib/python3.8/site-packages/uno.py + "${pkgdir}"/usr/lib/python3.9/site-packages/uno.py ln -svf /usr/lib/libreoffice/program/unohelper.py \ - "${pkgdir}"/usr/lib/python3.8/site-packages/unohelper.py + "${pkgdir}"/usr/lib/python3.9/site-packages/unohelper.py # add a symlink required for gnome-documents; FS#51887 # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html Modified: libvoikko/trunk/PKGBUILD =================================================================== --- libvoikko/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ libvoikko/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -29,7 +29,7 @@ cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - mkdir -p "$pkgdir"/usr/lib/python3.8/site-packages - cp python/libvoikko.py "$pkgdir"/usr/lib/python3.8/site-packages/libvoikko.py + mkdir -p "$pkgdir"/usr/lib/python3.9/site-packages + cp python/libvoikko.py "$pkgdir"/usr/lib/python3.9/site-packages/libvoikko.py } Modified: libxml2/trunk/PKGBUILD =================================================================== --- libxml2/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ libxml2/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -82,8 +82,8 @@ #Disabled for now, as I don't want to introduce file conflicts during a security update #python2 -m compileall -d /usr/lib/python2.7 "$pkgdir/usr/lib/python2.7" #python2 -O -m compileall -d /usr/lib/python2.7 "$pkgdir/usr/lib/python2.7" - #python -m compileall -d /usr/lib/python3.8 "$pkgdir/usr/lib/python3.8" - #python -O -m compileall -d /usr/lib/python3.8 "$pkgdir/usr/lib/python3.8" + #python -m compileall -d /usr/lib/python3.9 "$pkgdir/usr/lib/python3.9" + #python -O -m compileall -d /usr/lib/python3.9 "$pkgdir/usr/lib/python3.9" } # vim: ts=2 sw=2 et: Modified: pyalpm/trunk/PKGBUILD =================================================================== --- pyalpm/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ pyalpm/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -27,7 +27,7 @@ check() { cd ${srcdir}/${pkgname} - PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.8" pytest + PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.9" pytest } package() { Modified: python-feedparser/trunk/PKGBUILD =================================================================== --- python-feedparser/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ python-feedparser/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -23,7 +23,7 @@ build() { cd feedparser-${pkgver}-sgmllib - python /usr/lib/python3.8/compileall.py feedparser/sgmllib3.py + python /usr/lib/python3.9/compileall.py feedparser/sgmllib3.py } package_python2-feedparser() { @@ -50,7 +50,7 @@ cd "${srcdir}/feedparser-${pkgver}-sgmllib" install -Dm644 feedparser/sgmllib3.py \ - "${pkgdir}/usr/lib/python3.8/site-packages/sgmllib.py" - install -Dm644 feedparser/__pycache__/sgmllib3.cpython-38.pyc \ - "${pkgdir}/usr/lib/python3.8/site-packages/__pycache__/sgmllib.cpython-38.pyc" + "${pkgdir}/usr/lib/python3.9/site-packages/sgmllib.py" + install -Dm644 feedparser/__pycache__/sgmllib3.cpython-39.pyc \ + "${pkgdir}/usr/lib/python3.9/site-packages/__pycache__/sgmllib.cpython-39.pyc" } Modified: python-isort/trunk/PKGBUILD =================================================================== --- python-isort/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ python-isort/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -48,7 +48,7 @@ done # tests/test_importable.py::test_importable: This is just weird # tests/integration/test_projects_using_isort.py::test_airflow: https://github.com/PyCQA/isort/pull/1567#issuecomment-710787547 - PYTHONPATH="$PWD/example_isort_formatting_plugin:$PWD/example_shared_isort_profile:$PWD/tmp_install/usr/lib/python3.8/site-packages" PATH="$PWD/tmp_install/usr/bin:$PATH" \ + PYTHONPATH="$PWD/example_isort_formatting_plugin:$PWD/example_shared_isort_profile:$PWD/tmp_install/usr/lib/python3.9/site-packages" PATH="$PWD/tmp_install/usr/bin:$PATH" \ pytest --deselect tests/test_importable.py::test_importable --deselect tests/integration/test_projects_using_isort.py::test_airflow } Modified: python-numpy/trunk/PKGBUILD =================================================================== --- python-numpy/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ python-numpy/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -33,7 +33,7 @@ cd numpy-$pkgver python setup.py install --root="$PWD/tmp_install" --optimize=1 cd "$PWD/tmp_install" - PATH="$PWD/usr/bin:$PATH" PYTHONPATH="$PWD/usr/lib/python3.8/site-packages:$PYTHONPATH" python -c 'import numpy; numpy.test()' + PATH="$PWD/usr/bin:$PATH" PYTHONPATH="$PWD/usr/lib/python3.9/site-packages:$PYTHONPATH" python -c 'import numpy; numpy.test()' } package() { Modified: python-pip/trunk/PKGBUILD =================================================================== --- python-pip/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ python-pip/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -58,7 +58,7 @@ # appdirs: https://github.com/pypa/pip/issues/7784 # build_env: TODO weird looking errors # virtualenv: https://github.com/pypa/pip/issues/8273 - PYTHONPATH="$PWD/tmp_install/usr/lib/python3.8/site-packages" PATH="$PWD/tmp_install/usr/bin:$PATH" \ + PYTHONPATH="$PWD/tmp_install/usr/lib/python3.9/site-packages" PATH="$PWD/tmp_install/usr/bin:$PATH" \ python -m pytest -m unit --junit-xml=junit/unit-test.xml --deselect tests/unit/test_appdirs.py::TestSiteConfigDirs::test_site_config_dirs_linux \ --deselect tests/unit/test_appdirs.py::TestSiteConfigDirs::test_site_config_dirs_linux_override \ --deselect tests/unit/test_appdirs.py::TestSiteConfigDirs::test_site_config_dirs_linux_empty \ @@ -85,9 +85,9 @@ install -Dm644 -t "$pkgdir"/usr/share/man/man1 docs/build/man/* - PYTHONPATH="$pkgdir"/usr/lib/python3.8/site-packages "$pkgdir"/usr/bin/pip completion --bash \ + PYTHONPATH="$pkgdir"/usr/lib/python3.9/site-packages "$pkgdir"/usr/bin/pip completion --bash \ | install -Dm644 /dev/stdin "$pkgdir"/usr/share/bash-completion/completions/pip - PYTHONPATH="$pkgdir"/usr/lib/python3.8/site-packages "$pkgdir"/usr/bin/pip completion --fish \ + PYTHONPATH="$pkgdir"/usr/lib/python3.9/site-packages "$pkgdir"/usr/bin/pip completion --fish \ | install -Dm644 /dev/stdin "$pkgdir"/usr/share/fish/vendor_completions.d/pip.fish } Modified: python-pycurl/trunk/PKGBUILD =================================================================== --- python-pycurl/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ python-pycurl/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -46,7 +46,7 @@ # We don't have HTTP2 enabled cd "$srcdir"/pycurl-$pkgver - PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.8:$PYTHONPATH" make test || warning "Tests failed" + PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.9:$PYTHONPATH" make test || warning "Tests failed" cd "$srcdir"/pycurl-$pkgver-py2 PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH" make PYTHON=python2 NOSETESTS=nosetests2 test || warning "Tests failed" Modified: python-wrapt/trunk/PKGBUILD =================================================================== --- python-wrapt/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ python-wrapt/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -21,7 +21,7 @@ check() { cd "$srcdir"/wrapt-$pkgver - PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.8:$PYTHONPATH" py.test + PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.9:$PYTHONPATH" py.test } package() { Modified: python-zope-interface/trunk/PKGBUILD =================================================================== --- python-zope-interface/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ python-zope-interface/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -29,7 +29,7 @@ check() { cd "$srcdir"/zope.interface-$pkgver - PYTHONPATH="$PWD/build/lib.linux-x86_64-3.8" python setup.py test + PYTHONPATH="$PWD/build/lib.linux-x86_64-3.9" python setup.py test cd "$srcdir"/zope.interface-$pkgver-py2 PYTHONPATH="$PWD/build/lib.linux-x86_64-2.7" python2 setup.py test Modified: subversion/trunk/PKGBUILD =================================================================== --- subversion/trunk/PKGBUILD 2020-11-09 09:44:55 UTC (rev 399661) +++ subversion/trunk/PKGBUILD 2020-11-09 10:07:33 UTC (rev 399662) @@ -71,8 +71,8 @@ --disable-static make LT_LDFLAGS="-L$Fdestdir/usr/lib" - make swig_pydir=/usr/lib/python3.8/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python3.8/site-packages/svn swig-py swig-pl javahl swig-rb + make swig_pydir=/usr/lib/python3.9/site-packages/libsvn \ + swig_pydir_extra=/usr/lib/python3.9/site-packages/svn swig-py swig-pl javahl swig-rb } check() { @@ -86,8 +86,8 @@ export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH} make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ - swig_pydir=/usr/lib/python3.8/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python3.8/site-packages/svn \ + swig_pydir=/usr/lib/python3.9/site-packages/libsvn \ + swig_pydir_extra=/usr/lib/python3.9/site-packages/svn \ install install-swig-py install-swig-pl install-javahl install-swig-rb install -dm755 "${pkgdir}"/usr/share/subversion