Skip to content

Commit 901f765

Browse files
Version 0.3.0 (#20)
* Added packages * cleaned up example * Commit test * Added pre-commit hooks * Formatting * Updated example * Update package * Added multilevel metadata test * Bump version 0.1.8 -> 0.1.9 * Added mkdocstrings pip * Added trigger * Added handler * Added provenance * Added provenance * Added provenance * Added provenance * Added documentation and tests for provenance * Corrected string * Added TileJSON for MicroJSON * Added examples for tiling and description * Removed garbage files * Restructured tile examples * Updated TileJSON fields, added relative file URL * Bump version 0.1.9 -> 0.1.10 * Initial protobuf prototype * Initial protobuf encoder * Corrected version * Bump version 0.2.0 -> 0.3.0 * Corrected version --------- Co-authored-by: Nicholas-Schaub <[email protected]>
1 parent 3af771c commit 901f765

File tree

5 files changed

+15
-17
lines changed

5 files changed

+15
-17
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.1.9
2+
current_version = 0.3.0
33
commit = True
44
tag = False
55
parse = (?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(\\-(?P<release>[a-z]+)(?P<dev>\\d+))?

pyproject.toml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "microjson"
7-
version = "0.2.0"
7+
version = "0.3.0"
88
description = "MicroJSON is a library for validating, parsing, and manipulating MicroJSON data."
99
readme = "README_short.md"
1010
authors = ["Bengt Ljungquist <[email protected]>"]
@@ -15,16 +15,13 @@ classifiers = [
1515
"Programming Language :: Python :: 3",
1616
]
1717
keywords = ["json", "microscopy", "microjson"]
18+
packages = [
19+
{ include = "microjson", from = "src" }
20+
]
1821

1922
[tool.poetry.group.dev.dependencies]
2023
ipykernel = "^6.27.1"
2124

22-
[tool.setuptools]
23-
package-dir = {"" = "src"}
24-
25-
[tool.setuptools.packages.find]
26-
where = ["src"]
27-
2825
[tool.poetry.dependencies]
2926
python = ">=3.9.15,<3.12"
3027
pydantic = "^2.3.0"
@@ -46,7 +43,7 @@ extras = ["all"]
4643
optional = true
4744

4845
[tool.poetry.dependencies.scipy]
49-
version = "^1.9.1"
46+
version = ">=1.8"
5047
optional = true
5148

5249
[tool.poetry.dependencies.filepattern]
@@ -86,9 +83,10 @@ mkdocstrings = "^0.23.0"
8683

8784
[tool.pytest.ini_options]
8885
testpaths = ["tests/"]
86+
pythonpath = ["src/"]
8987

9088
[tool.bumpver]
91-
current_version = "0.2.0"
89+
current_version = "0.3.0"
9290
version_pattern = "MAJOR.MINOR.PATCH"
9391
commit_message = "Bump version {old_version} -> {new_version}"
9492
commit = true
@@ -98,3 +96,4 @@ push = false
9896
[tool.bumpver.file_patterns]
9997
"pyproject.toml" = ['current_version = "{version}"', 'version = "{version}"']
10098
"src/microjson/__init__.py" = ["{version}"]
99+
".bumpversion.cfg" = ["current_version = {version}"]

src/microjson/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
from .tilemodel import TileJSON # noqa: F401
33
from .microjson2vt.microjson2vt import microjson2vt # noqa: F401
44

5-
__version__ = "0.2.0"
6-
5+
__version__ = "0.3.0"

src/microjson/model.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
from typing import Any, List, Optional, Union, Dict, Literal, TypeVar
33
from enum import Enum
44
from pydantic import BaseModel, StrictInt, StrictStr, RootModel
5-
from microjson.provenance import Workflow
6-
from microjson.provenance import WorkflowCollection
7-
from microjson.provenance import Artifact
8-
from microjson.provenance import ArtifactCollection
5+
from .provenance import Workflow
6+
from .provenance import WorkflowCollection
7+
from .provenance import Artifact
8+
from .provenance import ArtifactCollection
99
from geojson_pydantic import Feature, FeatureCollection, GeometryCollection
1010
from geojson_pydantic import Point, MultiPoint, LineString, MultiLineString
1111
from geojson_pydantic import Polygon, MultiPolygon

tests/test_tilecut.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def test_tilecut(tempfolder):
2323
# Create folder with random name, a string of 6 characters
2424
microjson_data_path = f"{tempfolder}/polygons.json"
2525
# Parameters
26-
GRID_SIZE = 200000 # Total size of the grid
26+
GRID_SIZE = 50000 # Total size of the grid
2727
CELL_SIZE = 500 # Size of each cell
2828
MIN_VERTICES = 5 # Minimum number of vertices per polygon
2929
MAX_VERTICES = 32 # Maximum number of vertices per polygon

0 commit comments

Comments
 (0)