diff --git a/CHANGELOG.md b/CHANGELOG.md index 4006337..93c352a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ Axinite uses a derivative of the **semantic versioning system** to record change - Patch increments represent bug fixes, modifications that don't directly affect users, progress towards a milestone/goal, or other small changes. Although releases are only created for every minor or major increment, patch increments are still uploaded to PyPI. +## 1.22.16 (2/3/25) +- Fixed combine method including the path attribute ## 1.22.11 - 1.22.15 (2/1/25) - Made sure to include `scipy` in the dependencies - Stopped VPython from opening on import diff --git a/axinite/__init__.py b/axinite/__init__.py index 7cc80ea..61ef6f8 100644 --- a/axinite/__init__.py +++ b/axinite/__init__.py @@ -5,7 +5,7 @@ using various methods, and loading simulation data. """ -__version__ = "1.22.15" +__version__ = "1.22.16" from axinite.body import Body from axinite.functions import vector_magnitude_jit, unit_vector_jit, gravitational_force_jit, body_dtype, \ diff --git a/axinite/tools/combine.py b/axinite/tools/combine.py index a06f874..103a0b1 100644 --- a/axinite/tools/combine.py +++ b/axinite/tools/combine.py @@ -15,5 +15,6 @@ def combine(meta: dict, file: dict, indent=4) -> str: filedata = json.loads(file) if "name" in metadata and "name" in filedata: del filedata['name'] if "author" in metadata and "author" in filedata: del filedata['author'] + del metadata['path'] combined = {**metadata, **filedata} return json.dumps(combined, indent=indent) \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 7e19213..6e4af4e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "axinite" -version = "1.22.15" +version = "1.22.16" dependencies = ["numpy", "numba", "vpython", "plotly", "scipy"] authors = [{ name = "Jewels", email = "jewels@jewels86.me" }] maintainers = [{ name = "Jewels", email = "jewels@jewels86.me" }]