bsb-json 0.0.0b5__tar.gz → 4.0.0rc2__tar.gz

{bsb_json-0.0.0b5 → bsb_json-4.0.0rc2}/PKG-INFO

@@ -1,18 +1,18 @@
 Metadata-Version: 2.1
 Name: bsb-json
-Version: 0.0.0b5
+Version: 4.0.0rc2
 Summary: JSON parser and utilities for the BSB.
 Author-email: Robin De Schepper <robingilbert.deschepper@unipv.it>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
-Requires-Dist: bsb-core>=4.0.0b6,<=4.0.0b9999
+Requires-Dist: bsb-core==4.0.0rc2
 Requires-Dist: pre-commit~=3.5 ; extra == "dev"
 Requires-Dist: black~=23.11 ; extra == "dev"
 Requires-Dist: isort~=5.12 ; extra == "dev"
-Requires-Dist: bump2version~=1.0 ; extra == "dev"
+Requires-Dist: bump-my-version~=0.18 ; extra == "dev"
 Requires-Dist: bsb-core[parallel] ; extra == "test"
-Requires-Dist: bsb-test>=0.0.0b7,<=0.0.0b9999 ; extra == "test"
+Requires-Dist: bsb-test==4.0.0rc2 ; extra == "test"
 Requires-Dist: coverage~=7.0 ; extra == "test"
 Provides-Extra: dev
 Provides-Extra: test

{bsb_json-0.0.0b5 → bsb_json-4.0.0rc2}/bsb_json/__init__.py

@@ -4,4 +4,4 @@ JSON parser and utilities for the BSB.
 
 from .schema import get_json_schema, get_schema
 
-__version__ = "0.0.0b5"
+__version__ = "4.0.0-rc2"

{bsb_json-0.0.0b5 → bsb_json-4.0.0rc2}/bsb_json/parser.py

@@ -7,9 +7,15 @@ import json
 import os
 
 import numpy as np
-from bsb.config.parsers import Parser
-from bsb.exceptions import ConfigurationWarning, JsonImportError, JsonReferenceError
-from bsb.reporting import warn
+from bsb import ConfigurationParser, ConfigurationWarning, ParserError, warn
+
+
+class JsonImportError(ParserError):
+    pass
+
+
+class JsonReferenceError(ParserError):
+    pass
 
 
 def _json_iter(obj):  # pragma: nocover
@@ -150,10 +156,10 @@ def _to_json(value):
     if isinstance(value, np.ndarray):
         return value.tolist()
     else:
-        raise TypeError()
+        raise TypeError(f"Can't encode '{value}' ({type(value)})")
 
 
-class JsonParser(Parser):
+class JsonParser(ConfigurationParser):
     """
     Parser plugin class to parse JSON configuration files.
     """

bsb_json-4.0.0rc2/pyproject.toml

@@ -0,0 +1,70 @@
+[build-system]
+requires = ["flit_core >=3.2,<4"]
+build-backend = "flit_core.buildapi"
+
+[project]
+name = "bsb-json"
+authors = [{name = "Robin De Schepper", email = "robingilbert.deschepper@unipv.it"}]
+readme = "README.md"
+license = {file = "LICENSE"}
+classifiers = ["License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)"]
+dynamic = ["version", "description"]
+requires-python = ">=3.8"
+dependencies = ["bsb-core==4.0.0rc2"]
+
+[project.entry-points."bsb.config.parsers"]
+json = "bsb_json.parser"
+
+[project.entry-points."bsb.config.templates"]
+json_templates = "bsb_json.templates"
+
+[tool.flit.module]
+name = "bsb_json"
+
+[project.optional-dependencies]
+test = ["bsb-core[parallel]", "bsb-test==4.0.0rc2", "coverage~=7.0"]
+dev = [
+    "pre-commit~=3.5",
+    "black~=23.11",
+    "isort~=5.12",
+    "bump-my-version~=0.18"
+]
+
+[tool.isort]
+profile = "black"
+
+[tool.bumpversion]
+current_version = "4.0.0-rc2"
+parse = """(?x)
+    (?P<major>0|[1-9]\\d*)\\.
+    (?P<minor>0|[1-9]\\d*)\\.
+    (?P<patch>0|[1-9]\\d*)
+    (?:
+        -                             # dash seperator for pre-release section
+        (?P<pre_l>[a-zA-Z-]+)         # pre-release label
+        (?P<pre_n>0|[1-9]\\d*)        # pre-release version number
+    )?                                # pre-release section is optional
+"""
+serialize = [
+    "{major}.{minor}.{patch}-{pre_l}{pre_n}",
+    "{major}.{minor}.{patch}",
+]
+search = "{current_version}"
+replace = "{new_version}"
+regex = false
+ignore_missing_version = false
+tag = true
+sign_tags = false
+tag_name = "v{new_version}"
+tag_message = "Bump version: {current_version} → {new_version}"
+allow_dirty = false
+commit = true
+message = "Bump version: {current_version} → {new_version}"
+commit_args = "--no-verify"
+
+[tool.bumpversion.parts.pre_l]
+values = ["dev", "a", "b", "rc", "final"]
+optional_value = "final"
+
+[[tool.bumpversion.files]]
+filename = "bsb_json/__init__.py"

bsb_json-0.0.0b5/pyproject.toml

@@ -1,34 +0,0 @@
-[build-system]
-requires = ["flit_core >=3.2,<4"]
-build-backend = "flit_core.buildapi"
-
-[project]
-name = "bsb-json"
-authors = [{name = "Robin De Schepper", email = "robingilbert.deschepper@unipv.it"}]
-readme = "README.md"
-license = {file = "LICENSE"}
-classifiers = ["License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)"]
-dynamic = ["version", "description"]
-requires-python = ">=3.8"
-dependencies = ["bsb-core>=4.0.0b6,<=4.0.0b9999"]
-
-[project.entry-points."bsb.config.parsers"]
-json = "bsb_json.parser"
-
-[project.entry-points."bsb.config.templates"]
-json_templates = "bsb_json.templates"
-
-[tool.flit.module]
-name = "bsb_json"
-
-[project.optional-dependencies]
-test = ["bsb-core[parallel]", "bsb-test>=0.0.0b7,<=0.0.0b9999", "coverage~=7.0"]
-dev = [
-    "pre-commit~=3.5",
-    "black~=23.11",
-    "isort~=5.12",
-    "bump2version~=1.0"
-]
-
-[tool.isort]
-profile = "black"