-
-
Notifications
You must be signed in to change notification settings - Fork 19.7k
duckdb: 1.2.2 -> 1.3.2 #409698
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.
Already on GitHub? Sign in to your account
duckdb: 1.2.2 -> 1.3.2 #409698
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "version": "1.2.2", | ||
| "rev": "7c039464e452ddc3330e2691d3fa6d305521d09b", | ||
| "hash": "sha256-cHQcEA9Gpza/edEVyXUYiINC/Q2b3bf+zEQbl/Otfr4=" | ||
| "version": "1.3.2", | ||
| "rev": "0b83e5d2f68bc02dfefde74b846bd039f078affa", | ||
| "hash": "sha256-6NMQ893g+nOiH8dnb63oa+fZMNXs8N6tJv+Er4x547U=" | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ | |
| psutil, | ||
| pybind11, | ||
| setuptools-scm, | ||
| pytest-reraise, | ||
| pytestCheckHook, | ||
| }: | ||
|
|
||
|
|
@@ -35,21 +36,24 @@ buildPythonPackage rec { | |
| substituteInPlace setup.py \ | ||
| --replace-fail "ParallelCompile()" 'ParallelCompile("NIX_BUILD_CORES")' \ | ||
| --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "pass" | ||
|
|
||
| substituteInPlace pyproject.toml \ | ||
| --replace-fail 'setuptools_scm>=6.4,<8.0' 'setuptools_scm' | ||
|
Comment on lines
40
to
41
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This would also make a lovely upstream patch.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There's probably a reason for the constraint here, and I don't have the time right now to go digging around in the DuckDB codebase/going through the processes to figure out why.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Turns out they had some build issue that caused them to set the upper bound: duckdb/duckdb@13db15b
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Turns out that
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hello, my I ask a few questions for my own understanding and learning? Was this change necessary due to failures on a specific architecture? When I attempted this update, I only encountered problems with Additionally, there is an excluded test, which is linked to an upstream issue that has now been closed, and the test passes. When should we take care of this type of cleanup? (I'm talking about |
||
| ''; | ||
|
|
||
| env = { | ||
| DUCKDB_BUILD_UNITY = 1; | ||
| OVERRIDE_GIT_DESCRIBE = "v${version}-0-g${rev}"; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ | ||
| build-system = [ | ||
| pybind11 | ||
| setuptools-scm | ||
| ]; | ||
|
|
||
| buildInputs = [ openssl ]; | ||
|
|
||
| propagatedBuildInputs = [ | ||
| dependencies = [ | ||
| numpy | ||
| pandas | ||
| ]; | ||
|
|
@@ -58,11 +62,12 @@ buildPythonPackage rec { | |
| fsspec | ||
| google-cloud-storage | ||
| psutil | ||
| pytest-reraise | ||
| pytestCheckHook | ||
| ]; | ||
|
|
||
| # test flags from .github/workflows/Python.yml | ||
| pytestFlagsArray = [ "--verbose" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/fast" ]; | ||
| pytestFlagsArray = [ "tests/fast" ]; | ||
|
|
||
| disabledTestPaths = [ | ||
| # avoid dependency on mypy | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| { | ||
| lib, | ||
| buildPythonPackage, | ||
| fetchFromGitHub, | ||
| pytest, | ||
| pytestCheckHook, | ||
| poetry-core, | ||
| }: | ||
|
|
||
| buildPythonPackage rec { | ||
| pname = "pytest-reraise"; | ||
| version = "2.1.2"; | ||
| pyproject = true; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "bjoluc"; | ||
| repo = pname; | ||
| tag = "v${version}"; | ||
| hash = "sha256-mgNKoZ+2sinArTZhSwhLxzBTb4QfiT1LWBs7w5MHXWA="; | ||
| }; | ||
|
|
||
| postPatch = '' | ||
| substituteInPlace pyproject.toml \ | ||
| --replace-fail 'poetry>=0.12' 'poetry-core>=1.0.0' \ | ||
| --replace-fail 'poetry.masonry' 'poetry.core.masonry' | ||
|
cpcloud marked this conversation as resolved.
Outdated
|
||
| ''; | ||
|
|
||
| build-system = [ poetry-core ]; | ||
|
|
||
| dependencies = [ pytest ]; | ||
|
|
||
| nativeCheckInputs = [ pytestCheckHook ]; | ||
|
|
||
| pythonImportsCheck = [ "pytest_reraise" ]; | ||
|
|
||
| meta = { | ||
| description = "Make multi-threaded pytest test cases fail when they should"; | ||
| longDescription = '' | ||
| Make multi-threaded pytest test cases fail when they should | ||
| ''; | ||
|
cpcloud marked this conversation as resolved.
Outdated
|
||
| homepage = "https://github.com/bjoluc/pytest-reraise"; | ||
| changelog = "https://github.com/bjoluc/pytest-reraise/releases/tag/${src.tag}"; | ||
| license = lib.licenses.mit; | ||
| maintainers = with lib.maintainers; [ cpcloud ]; | ||
| }; | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.