hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

py-pyside: fix build with python3.8 (#38886)

Browse source 
* py-pyside: fix build for version 1.2.2

* Remove check for python version

* Fix style

* Remove unnecessary patch

* Update var/spack/repos/builtin/packages/py-pyside/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Update var/spack/repos/builtin/packages/py-pyside/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Remove py-markupsafe conflict

* Update var/spack/repos/builtin/packages/py-pyside/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Update var/spack/repos/builtin/packages/py-pyside/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Move python check removal below suprocess patch

* Remove preference of 1.2.2

---------

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
This commit is contained in:
Manuela Kuhn 2023-07-17 22:54:59 +02:00 committed by GitHub
parent 1730bcaa31
commit 1fa60a6c70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
var/spack/repos/builtin/packages/py-pyside/package.py
View file

@ -26,21 +26,19 @@ class PyPyside(PythonPackage):
"1.2.4", sha256="1421bc1bf612c396070de9e1ffe227c07c1f3129278bc7d30c754b5146be2433" "1.2.4", sha256="1421bc1bf612c396070de9e1ffe227c07c1f3129278bc7d30c754b5146be2433"
) # rpath problems ) # rpath problems
# v1.2.2 does not work with Python3 version("1.2.2", sha256="53129fd85e133ef630144c0598d25c451eab72019cdcb1012f2aec773a3f25be")
version(
"1.2.2",
sha256="53129fd85e133ef630144c0598d25c451eab72019cdcb1012f2aec773a3f25be",
preferred=True,
)
depends_on("cmake", type="build")
# to prevent error: 'PyTypeObject' {aka 'struct _typeobject'} has no member
# named 'tp_print'
depends_on("python@:3.8", type=("build", "run"))
depends_on("py-setuptools", type="build") depends_on("py-setuptools", type="build")
# in newer pip versions --install-option does not exist # in newer pip versions --install-option does not exist
depends_on("py-pip@:23.0", type="build") depends_on("py-pip@:23.0", type="build")
depends_on("cmake@2.6:", type="build")
depends_on("py-sphinx", type=("build", "run")) depends_on("py-sphinx", type=("build", "run"))
depends_on("py-sphinx@:3.5.0", type=("build", "run"), when="@:1.2.2") depends_on("py-sphinx@:3.5.0", type=("build", "run"), when="@:1.2.2")
depends_on("qt@4.5:4.9") depends_on("qt@4.6:4.8")
depends_on("libxml2@2.6.32:") depends_on("libxml2@2.6.32:")
depends_on("libxslt@1.1.19:") depends_on("libxslt@1.1.19:")
@ -59,6 +57,9 @@ def patch(self):
) )
filter_file("^ if subprocess.mswindows:", " if mswindows:", "popenasync.py") filter_file("^ if subprocess.mswindows:", " if mswindows:", "popenasync.py")
# Remove check for python version because the above patch adds support for newer versions
filter_file("^check_allowed_python_version()", "", "setup.py")
# Add Spack's standard CMake args to the sub-builds. # Add Spack's standard CMake args to the sub-builds.
# They're called BY setup.py so we have to patch it. # They're called BY setup.py so we have to patch it.
filter_file( filter_file(
@ -84,14 +85,5 @@ def patch(self):
# PySide can't find the Shiboken library, even though it comes # PySide can't find the Shiboken library, even though it comes
# bundled with it and is installed in the same directory. # bundled with it and is installed in the same directory.
# PySide does not provide official support for
# Python 3.5, but it should work fine
filter_file(
"'Programming Language :: Python :: 3.4'",
"'Programming Language :: Python :: 3.4',\r\n "
"'Programming Language :: Python :: 3.5'",
"setup.py",
)
def install_options(self, spec, prefix): def install_options(self, spec, prefix):
return ["--jobs={0}".format(make_jobs)] return ["--jobs={0}".format(make_jobs)]