Merge pull request #278396 from mweinelt/sqlalchemy-1.4.51

python311Packages.sqlalchemy_1_4: init at 1.4.51
This commit is contained in:
Martin Weinelt 2024-01-03 16:36:47 +01:00 committed by GitHub
commit 86a3c44b5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 180 additions and 108 deletions

View File

@ -29,18 +29,7 @@ let
scmsrht = self.callPackage ./scm.nix { };
# sourcehut is not (yet) compatible with SQLAlchemy 2.x
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.4.46";
src = fetchPypi {
pname = "SQLAlchemy";
inherit version;
hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
};
nativeCheckInputs = with super; [ pytestCheckHook mock ];
disabledTestPaths = []
# Disable incompatible tests on Darwin.
++ lib.optionals stdenv.isDarwin [ "test/aaa_profiling" ];
});
sqlalchemy = super.sqlalchemy_1_4;
flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "2.5.1";

View File

@ -1,6 +1,5 @@
{ lib
, python3
, fetchPypi
, buildNpmPackage
, fetchFromGitHub
, jq
@ -11,18 +10,7 @@ let
python = python3.override {
packageOverrides = self: super: {
# pyCA is incompatible with SQLAlchemy 2.0
sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
version = "1.4.46";
src = fetchPypi {
pname = "SQLAlchemy";
inherit version;
hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
};
disabledTestPaths = [
"test/aaa_profiling"
"test/ext/mypy"
];
});
sqlalchemy = super.sqlalchemy_1_4;
};
};

View File

@ -2,13 +2,21 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, mako
, python-dateutil
, sqlalchemy
# build-system
, setuptools
# dependencies
, importlib-metadata
, importlib-resources
, pytest-xdist
, mako
, sqlalchemy
, typing-extensions
# tests
, pytestCheckHook
, pytest-xdist
, python-dateutil
}:
buildPythonPackage rec {
@ -23,13 +31,16 @@ buildPythonPackage rec {
hash = "sha256-jnZFwy5PIAZ15p8HRUFTNetZo2Y/X+tIer+gswxFiIs=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
mako
python-dateutil
sqlalchemy
typing-extensions
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
@ -40,6 +51,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
pytest-xdist
python-dateutil
];
meta = with lib; {

View File

@ -5,6 +5,7 @@
, pymorphy3
, pymorphy3-dicts-uk
, sentencepiece
, setuptools
, spacy
, spacy-pkuseg
, spacy-transformers
@ -23,6 +24,7 @@ let
in
buildPythonPackage {
inherit pname version;
pyproject = true;
src = fetchurl {
url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
@ -41,7 +43,9 @@ let
--replace "protobuf<3.21.0" "protobuf"
'';
nativeBuildInputs = lib.optionals requires-protobuf [
nativeBuildInputs = [
setuptools
] ++ lib.optionals requires-protobuf [
protobuf
];

View File

@ -0,0 +1,140 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
# build-system
, setuptools
# dependencies
, greenlet
# optionals
, aiomysql
, aiosqlite
, asyncmy
, asyncpg
, cx_oracle
, mariadb
, mypy
, mysql-connector
, mysqlclient
, pg8000
, psycopg2
, psycopg2cffi
# TODO: pymssql
, pymysql
, pyodbc
# TODO: sqlcipher3
, typing-extensions
# tests
, mock
, pytest-xdist
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "sqlalchemy";
version = "1.4.51";
pyproject = true;
src = fetchFromGitHub {
owner = "sqlalchemy";
repo = "sqlalchemy";
rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-KhLSKlQ4xfSh1nsAt+cRO+adh2aj/h/iqV6YmDbz39k=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
greenlet
];
passthru.optional-dependencies = lib.fix (self: {
asyncio = [
greenlet
];
mypy = [
mypy
];
mssql = [
pyodbc
];
mssql_pymysql = [
# TODO: pymssql
];
mssql_pyodbc = [
pyodbc
];
mysql = [
mysqlclient
];
mysql_connector = [
mysql-connector
];
mariadb_connector = [
mariadb
];
oracle = [
cx_oracle
];
postgresql = [
psycopg2
];
postgresql_pg8000 = [
pg8000
];
postgresql_asyncpg = [
asyncpg
] ++ self.asyncio;
postgresql_psycopg2binary = [
psycopg2
];
postgresql_psycopg2cffi = [
psycopg2cffi
];
pymysql = [
pymysql
];
aiomysql = [
aiomysql
] ++ self.asyncio;
asyncmy = [
asyncmy
] ++ self.asyncio;
aiosqlite = [
aiosqlite
typing-extensions
] ++ self.asyncio;
sqlcipher = [
# TODO: sqlcipher3
];
});
nativeCheckInputs = [
pytest-xdist
pytestCheckHook
mock
];
disabledTestPaths = [
# typing correctness, not interesting
"test/ext/mypy"
# slow and high memory usage, not interesting
"test/aaa_profiling"
];
pythonImportsCheck = [
"sqlalchemy"
];
meta = with lib; {
changelog = "https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_${builtins.replaceStrings [ "." ] [ "_" ] version}";
description = "The Database Toolkit for Python";
homepage = "https://github.com/sqlalchemy/sqlalchemy";
license = licenses.mit;
};
}

View File

@ -6,6 +6,7 @@
, setuptools-scm
, pytestCheckHook
, typing-extensions
, importlib-metadata
, sphinxHook
, sphinx-autodoc-typehints
, sphinx-rtd-theme
@ -40,6 +41,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [
typing-extensions
] ++ lib.optionals (pythonOlder "3.10") [
importlib-metadata
];
env.LC_ALL = "en_US.utf-8";

View File

@ -6,18 +6,7 @@
let
python = python3.override {
packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.4.50";
src = fetchPypi {
pname = "SQLAlchemy";
inherit version;
hash = "sha256-O5fd9Qn8IeELCUA7UhmwbFtViyf8JFMVAnT6TnBwfb8=";
};
disabledTestPaths = [
"test/aaa_profiling"
"test/ext/mypy"
];
});
sqlalchemy = super.sqlalchemy_1_4;
moto = super.moto.overridePythonAttrs (oldAttrs: rec {
# a lot of tests -> very slow, we already build them when building python packages
doCheck = false;

View File

@ -52,19 +52,7 @@ let
});
# apache-airflow doesn't work with sqlalchemy 2.x
# https://github.com/apache/airflow/issues/28723
sqlalchemy = pySuper.sqlalchemy.overridePythonAttrs (o: rec {
version = "1.4.48";
src = fetchFromGitHub {
owner = "sqlalchemy";
repo = "sqlalchemy";
rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-qyD3uoxEnD2pdVvwpUlSqHB3drD4Zg/+ov4CzLFIlLs=";
};
disabledTestPaths = [
"test/aaa_profiling"
"test/ext/mypy"
];
});
sqlalchemy = pySuper.sqlalchemy_1_4;
apache-airflow = pySelf.callPackage ./python-package.nix { };
};

View File

@ -2,24 +2,12 @@
, fetchFromGitHub
, nixosTests
, python3
, fetchPypi
}:
let
python = python3.override {
packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
version = "1.4.46";
src = fetchPypi {
pname = "SQLAlchemy";
inherit version;
hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
};
disabledTestPaths = [
"test/aaa_profiling"
"test/ext/mypy"
];
});
sqlalchemy = super.sqlalchemy_1_4;
};
};
in

View File

@ -8,19 +8,8 @@
let
python = python3.override {
packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.4.49";
src = fetchPypi {
pname = "SQLAlchemy";
inherit version;
hash = "sha256-Bv8ly64ww5bEt3N0ZPKn/Deme32kCZk7GCsCTOyArtk=";
};
# Remove "test/typing" that does not exist
disabledTestPaths = [
"test/aaa_profiling"
"test/ext/mypy"
];
});
sqlalchemy = super.sqlalchemy_1_4;
flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "3.0.5";

View File

@ -31,6 +31,7 @@ buildPythonPackage rec {
gunicorn
lazr-config
passlib
python-dateutil
requests
sqlalchemy
zope-component

View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, python39
, fetchPypi
, fetchFromGitHub
, fetchpatch
, withXmpp ? !stdenv.isDarwin
@ -18,18 +17,9 @@ let
ntfy-webpush = self.callPackage ./webpush.nix { };
# databases, on which slack-sdk depends, is incompatible with SQLAlchemy 2.0
sqlalchemy = super.sqlalchemy.overridePythonAttrs rec {
version = "1.4.46";
src = fetchPypi {
pname = "SQLAlchemy";
inherit version;
hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
};
disabledTestPaths = [
"test/aaa_profiling"
"test/ext/mypy"
];
};
sqlalchemy = super.sqlalchemy_1_4;
django = super.django_3;
};
};
in python.pkgs.buildPythonApplication rec {

View File

@ -6,18 +6,7 @@
let
python = python3.override {
packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.4.46";
src = fetchPypi {
pname = "SQLAlchemy";
inherit version;
hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
};
disabledTestPaths = [
"test/aaa_profiling"
"test/ext/mypy"
];
});
sqlalchemy = super.sqlalchemy_1_4;
};
};
in

View File

@ -13622,6 +13622,8 @@ self: super: with self; {
sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
sqlalchemy_1_4 = callPackage ../development/python-modules/sqlalchemy/1_4.nix { };
sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { };
sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { };