diff options
| author | Florian Klink <flokli@flokli.de> | 2024-04-03 15:00:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 15:00:20 +0300 |
| commit | 33fcd9cff89d12089c676cfb3dc7d1158faac648 (patch) | |
| tree | e65a62d507433e8cdb932f3f17215799c1d6253e | |
| parent | facc1761b478d52c7f5b333d5ea5558f030eaa11 (diff) | |
| parent | 51912b15f834ad07536783f4eea62fb50341d0f8 (diff) | |
Merge pull request #301220 from edef1c/parquet-tools/moto-5
parquet-tools: support Moto 5.x
| -rw-r--r-- | pkgs/tools/misc/parquet-tools/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/parquet-tools/moto5.patch | 28 |
2 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix index bd35304f3cf1d..cc5d25b1538af 100644 --- a/pkgs/tools/misc/parquet-tools/default.nix +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -18,6 +18,12 @@ buildPythonApplication rec { hash = "sha256-2jIwDsxB+g37zV9hLc2VNC5YuZXTpTmr2aQ72AeHYJo="; }; + patches = [ + # support Moto 5.x + # https://github.com/ktrueda/parquet-tools/pull/55 + ./moto5.patch + ]; + postPatch = '' substituteInPlace tests/test_inspect.py \ --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \ diff --git a/pkgs/tools/misc/parquet-tools/moto5.patch b/pkgs/tools/misc/parquet-tools/moto5.patch new file mode 100644 index 0000000000000..5e79c1a204fcc --- /dev/null +++ b/pkgs/tools/misc/parquet-tools/moto5.patch @@ -0,0 +1,28 @@ +diff --git a/tests/fixtures/aws.py b/tests/fixtures/aws.py +index 7eea4bd..9fb3345 100644 +--- a/tests/fixtures/aws.py ++++ b/tests/fixtures/aws.py +@@ -1,15 +1,17 @@ + import boto3 +-from moto import mock_s3 + import pytest + ++try: ++ # Moto 4.x ++ from moto import mock_s3 ++except ImportError: ++ # Moto 5.x ++ from moto import mock_aws as mock_s3 + + @pytest.fixture + def aws_session(): +- mock_s3_server = mock_s3() +- mock_s3_server.start() +- yield boto3.Session() +- mock_s3_server.stop() +- ++ with mock_s3(): ++ yield boto3.Session() + + @pytest.fixture + def aws_s3_bucket(aws_session): |