Skip to content
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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mbutil: drop nose dependency #334492

Merged
merged 1 commit into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions pkgs/applications/misc/mbutil/default.nix
Original file line number Diff line number Diff line change
@@ -1,25 +1,36 @@
{ lib, buildPythonApplication, fetchFromGitHub, nose }:
{
lib,
buildPythonApplication,
fetchFromGitHub,
setuptools,
pytestCheckHook,
}:

buildPythonApplication rec {
pname = "mbutil";
version = "0.3.0";
pyproject = true;

src = fetchFromGitHub {
owner = "mapbox";
repo = pname;
rev = "v${version}";
sha256 = "06d62r89h026asaa4ryzb23m86j0cmbvy54kf4zl5f35sgiha45z";
repo = "mbutil";
rev = "refs/tags/v${version}";
hash = "sha256-vxAF49NluEI/cZMUv1dlQBpUh1jfZ6KUVkYAmFAWphk=";
};

nativeCheckInputs = [ nose ];
checkPhase = "nosetests";
patches = [ ./migrate_to_pytest.patch ];

meta = with lib; {
build-system = [ setuptools ];

nativeCheckInputs = [ pytestCheckHook ];
pytestFlagsArray = [ "test/test.py" ];

meta = {
description = "Importer and exporter for MBTiles";
mainProgram = "mb-util";
homepage = "https://github.com/mapbox/mbutil";
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ sikmir ];
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ sikmir ];
};
}
30 changes: 30 additions & 0 deletions pkgs/applications/misc/mbutil/migrate_to_pytest.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
diff --git a/test/test.py b/test/test.py
index e02e259..1452fda 100644
--- a/test/test.py
+++ b/test/test.py
@@ -1,13 +1,24 @@
import os, shutil
import sys
import json
-from nose import with_setup
from mbutil import mbtiles_to_disk, disk_to_mbtiles

def clear_data():
try: shutil.rmtree('test/output')
except Exception: pass

+
+def with_setup(setup_func, teardown_func):
+ def wrapper(func):
+ def wrapped(*args, **kwargs):
+ setup_func()
+ func(*args, **kwargs)
+ teardown_func()
+
+ return wrapped
+ return wrapper
+
+
@with_setup(clear_data, clear_data)
def test_mbtiles_to_disk():
mbtiles_to_disk('test/data/one_tile.mbtiles', 'test/output')