diff --git a/mingw-w64-python-sqlparse/PKGBUILD b/mingw-w64-python-sqlparse/PKGBUILD index f558f53b15..24eba9a864 100644 --- a/mingw-w64-python-sqlparse/PKGBUILD +++ b/mingw-w64-python-sqlparse/PKGBUILD @@ -2,82 +2,45 @@ _realname=sqlparse pkgbase=mingw-w64-python-${_realname} -pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") +pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Non-validating SQL parser for Python (mingw-w64)" arch=('any') url='https://github.com/andialbrecht/sqlparse' license=('BSD') -makedepends=("${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-python3-setuptools" - "${MINGW_PACKAGE_PREFIX}-python2-setuptools") +depends=("${MINGW_PACKAGE_PREFIX}-python3") +makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools") options=('staticlibs' 'strip' '!debug') source=("${_realname}-$pkgver.tar.gz::https://github.com/andialbrecht/sqlparse/archive/${pkgver}.tar.gz") sha256sums=('a75fddae009fba1d66786203c9dd3a842aa4415475c466d15484139117108474') -# Helper macros to help make tasks easier # -apply_patch_with_msg() { - for _patch in "$@" - do - msg2 "Applying ${_patch}" - patch -Nbp1 -i "${srcdir}/${_patch}" - done -} - -del_file_exists() { - for _fname in "$@" - do - if [ -f $_fname ]; then - rm -rf $_fname - fi - done -} -# =========================================== # - prepare() { - cd "${srcdir}" - pushd "${_realname}-${pkgver}" -# apply_patch_with_msg 0001-A-really-important-fix.patch \ -# 0002-A-less-important-fix.patch - popd - for builddir in python{2,3}-build-${CARCH}; do - rm -rf ${builddir} | true - cp -r "${_realname}-${pkgver}" "${builddir}" - done + cd "${srcdir}/${_realname}-${pkgver}" + # Set version for setuptools_scm export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver } -# Note that build() is sometimes skipped because it's done in -# the packages setup.py install for simplicity if you can do so. -# but sometimes, you want to do a check before install which would -# also trigger the build. build() { - for pver in {2,3}; do - msg "Python ${pver} build for ${CARCH}" - cd "${srcdir}/python${pver}-build-${CARCH}" - ${MINGW_PREFIX}/bin/python${pver} setup.py build - done + cd "${srcdir}/${_realname}-${pkgver}" + + ${MINGW_PREFIX}/bin/python3 setup.py build } check() { - for pver in {2,3}; do - msg "Python ${pver} test for ${CARCH}" - cd "${srcdir}/python${pver}-build-${CARCH}" - ${MINGW_PREFIX}/bin/python${pver} setup.py test - done + cd "${srcdir}/${_realname}-${pkgver}" + + ${MINGW_PREFIX}/bin/python3 setup.py test } -package_python3-sqlparse() { - depends=("${MINGW_PACKAGE_PREFIX}-python3") +package() { #This package install is needed for .fixups with .EXE's #in the bit directory. The install files "python-exe-installs" #and should be renamed to your _realname . install=${_realname}3-${CARCH}.install - cd "${srcdir}/python3-build-${CARCH}" + 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 @@ -95,57 +58,3 @@ package_python3-sqlparse() { done #### end section #### } - -package_python2-sqlparse() { - depends=("${MINGW_PACKAGE_PREFIX}-python2") - #This package install is needed for .fixups with .EXE's - #in the bit directory. The install files "python-exe-installs" - #and should be renamed to your _realname - install=${_realname}2-${CARCH}.install - - cd "${srcdir}/python2-build-${CARCH}" - MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \ - --root="${pkgdir}" --optimize=1 --skip-build - - install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE" - -# This entire section should be removed if the package does NOT install -# anything in the /mingw*/bin directory. -### begin section ### - local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) - # fix python command in files - for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do - sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \ - -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f} - done - -# for Python2 packages, you want to rename some stuff from the bin directory -# with the 2 suffix like in the mingw-w64-python-pygments package to avoid -# conflicts when installing both the Python2 and Python3 packages - for f in sqlformat; do - mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}.exe - if [ -f "${pkgdir}${MINGW_PREFIX}"/bin/${f}.exe.manifest ]; then - mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}.exe.manifest - sed -e "s|${f}|${f}2|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/${f}2.exe.manifest - fi - mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}-script.py - done -#### end section #### -} - -package_mingw-w64-i686-python2-sqlparse() { - package_python2-sqlparse -} - -package_mingw-w64-i686-python3-sqlparse() { - package_python3-sqlparse -} - -package_mingw-w64-x86_64-python2-sqlparse() { - package_python2-sqlparse -} - -package_mingw-w64-x86_64-python3-sqlparse() { - package_python3-sqlparse -} diff --git a/mingw-w64-python-sqlparse/sqlparse2-i686.install b/mingw-w64-python-sqlparse/sqlparse2-i686.install deleted file mode 100644 index dcd6b28ba6..0000000000 --- a/mingw-w64-python-sqlparse/sqlparse2-i686.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - cd mingw32 - local _prefix=$(pwd -W) - cd - - local _it - for _it in sqlformat2; do - sed -e "s|/mingw32|${_prefix}|g" \ - -i ${_prefix}/bin/${_it}-script.py - done -} - -post_upgrade() { - post_install -} diff --git a/mingw-w64-python-sqlparse/sqlparse2-x86_64.install b/mingw-w64-python-sqlparse/sqlparse2-x86_64.install deleted file mode 100644 index b11a1b8a44..0000000000 --- a/mingw-w64-python-sqlparse/sqlparse2-x86_64.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - cd mingw64 - local _prefix=$(pwd -W) - cd - - local _it - for _it in sqlformat2; do - sed -e "s|/mingw64|${_prefix}|g" \ - -i ${_prefix}/bin/${_it}-script.py - done -} - -post_upgrade() { - post_install -}