From 54fdae4a79427a62ee242bfb6bee260f2057d444 Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Sat, 22 Jul 2023 06:41:00 +0200 Subject: [PATCH] py-sqlalchemy: add 2.0.19 (#38951) * py-sqlalchemy: add 2.0.19 * [@spackbot] updating style on behalf of manuelakuhn * Add py-cython and py-greenlet and fix dependency type * Fix typo --- .../builtin/packages/py-sqlalchemy/package.py | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py index 1480536e26..de5d823e6d 100644 --- a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py @@ -13,6 +13,7 @@ class PySqlalchemy(PythonPackage): pypi = "SQLAlchemy/SQLAlchemy-1.3.9.tar.gz" git = "https://github.com/sqlalchemy/sqlalchemy.git" + version("2.0.19", sha256="77a14fa20264af73ddcdb1e2b9c5a829b8cc6b8304d0f093271980e36c200a3f") version("1.4.45", sha256="fd69850860093a3f69fefe0ab56d041edfdfe18510b53d9a2eaecba2f15fa795") version("1.4.44", sha256="2dda5f96719ae89b3ec0f1b79698d86eb9aecb1d54e990abb3fdd92c04b46a90") version("1.4.25", sha256="1adf3d25e2e33afbcd48cfad8076f9378793be43e7fec3e4334306cac6bec138") @@ -24,22 +25,25 @@ class PySqlalchemy(PythonPackage): version("1.1.18", sha256="8b0ec71af9291191ba83a91c03d157b19ab3e7119e27da97932a4773a3f664a9") version("1.0.12", sha256="6679e20eae780b67ba136a4a76f83bb264debaac2542beefe02069d0206518d1") - depends_on("python@2.7:2.8,3.6:", when="@1.4:", type=("build", "run")) - depends_on("python@2.7:2.8,3.4:", when="@:1.3", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-importlib-metadata", when="@1.4.0: ^python@:3.7", type="run") - depends_on("py-greenlet@:0.4.16,0.4.18:", when="@1.4.0:", type="run") - variant( "backend", description="Python modules for database access", - values=any_combination_of("mysql", "pymysql", "postgresql"), + values=any_combination_of("mysql", "postgresql", "pymysql"), ) + depends_on("py-setuptools@47:", when="@2:", type="build") + depends_on("py-setuptools", type="build") + depends_on("py-cython@0.29.24:", when="@2:", type="build") + + depends_on("py-importlib-metadata", when="@1.4.0: ^python@:3.7", type=("build", "run")) + depends_on("py-greenlet", when="@1.4.0:", type=("build", "run")) + conflicts("^py-greenlet@0.4.17", when="@1.4.0:") + depends_on("py-typing-extensions@4.2.0", when="@2:", type=("build", "run")) + # >=1.4.0 depends_on("py-mysqlclient@1.4:", when="backend=mysql @1.4:", type=("build", "run")) - depends_on("py-pymysql", when="backend=pymysql @1.4:", type=("build", "run")) depends_on("py-psycopg2@2.7:", when="backend=postgresql @1.4:", type=("build", "run")) + depends_on("py-pymysql", when="backend=pymysql @1.4:", type=("build", "run")) # < 1.4.0 depends_on("py-mysqlclient", when="backend=mysql @:1.3", type=("build", "run"))