| 1 | From acefbee3c0cefea291c4dfc8c2d4751c7bd9190c Mon Sep 17 00:00:00 2001
|
| 2 | From: Andrew Robbins <[email protected]>
|
| 3 | Date: Fri, 14 Mar 2025 12:58:30 -0400
|
| 4 | Subject: [PATCH 1/3] use modern importlib.resources
|
| 5 |
|
| 6 | ---
|
| 7 | norns/cfg.py | 7 ++++---
|
| 8 | 1 file changed, 4 insertions(+), 3 deletions(-)
|
| 9 |
|
| 10 | diff --git a/norns/cfg.py b/norns/cfg.py
|
| 11 | index 5868f56..c2170d9 100644
|
| 12 | |
| 13 | |
| 14 | @@ -5,7 +5,7 @@
|
| 15 | from UserDict import DictMixin
|
| 16 | except ImportError:
|
| 17 | from collections.abc import MutableMapping as DictMixin
|
| 18 | -import pkg_resources
|
| 19 | +import importlib.resources
|
| 20 |
|
| 21 | from norns.exceptions import ConfigError
|
| 22 |
|
| 23 | @@ -49,8 +49,9 @@ def __init__(self, name=None, config_file=None, default=None):
|
| 24 |
|
| 25 | if default and (not self.config_file or
|
| 26 | not os.path.exists(self.config_file)):
|
| 27 | - self.config_file = pkg_resources.resource_filename(name, default)
|
| 28 | -
|
| 29 | + self.config_file = importlib.resources.files(name) / default
|
| 30 | + #self.config_file = importlib.resources.as_file(config_traversable)
|
| 31 | +
|
| 32 | if not self.config_file or not os.path.exists(self.config_file):
|
| 33 | raise ConfigError("please provide name or config_file")
|
| 34 |
|
| 35 |
|
| 36 | From 332464e266536144d33e02ccb7c65d1078fd68db Mon Sep 17 00:00:00 2001
|
| 37 | From: Andrew Robbins <[email protected]>
|
| 38 | Date: Fri, 14 Mar 2025 12:58:43 -0400
|
| 39 | Subject: [PATCH 2/3] bump version
|
| 40 |
|
| 41 | ---
|
| 42 | norns/__about__.py | 2 +-
|
| 43 | 1 file changed, 1 insertion(+), 1 deletion(-)
|
| 44 |
|
| 45 | diff --git a/norns/__about__.py b/norns/__about__.py
|
| 46 | index 06ea00e..7de2db7 100644
|
| 47 | |
| 48 | |
| 49 | @@ -1,3 +1,3 @@
|
| 50 | """Metadata"""
|
| 51 | -__version__ = '0.1.4'
|
| 52 | +__version__ = '0.1.6'
|
| 53 | __author__ = "Simon van Heeringen"
|
| 54 |
|
| 55 | From 0caea8432132fc002761b53b05652514e5359e3f Mon Sep 17 00:00:00 2001
|
| 56 | From: Andrew Robbins <[email protected]>
|
| 57 | Date: Fri, 14 Mar 2025 14:58:50 -0400
|
| 58 | Subject: [PATCH 3/3] use pynose as nose is not maintained
|
| 59 |
|
| 60 | ---
|
| 61 | requirements.txt | 2 +-
|
| 62 | setup.py | 2 +-
|
| 63 | 2 files changed, 2 insertions(+), 2 deletions(-)
|
| 64 |
|
| 65 | diff --git a/requirements.txt b/requirements.txt
|
| 66 | index 992ab2a..d3920be 100644
|
| 67 | |
| 68 | |
| 69 | @@ -1,3 +1,3 @@
|
| 70 | -nose
|
| 71 | +pynose
|
| 72 | appdirs
|
| 73 | pyyaml>=5.1
|
| 74 | diff --git a/setup.py b/setup.py
|
| 75 | index d9f5aec..0c68475 100644
|
| 76 | |
| 77 | |
| 78 | @@ -28,7 +28,7 @@
|
| 79 | }
|
| 80 |
|
| 81 | requires = [
|
| 82 | - 'nose',
|
| 83 | + 'pynose',
|
| 84 | 'appdirs',
|
| 85 | 'pyyaml',
|
| 86 | ]
|