Skip to content
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ on:
jobs:
build-and-release-package:
if: github.repository == 'cmlibs-python/cmlibs.argon'
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
name: Release package
permissions:
contents: write
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
steps:
- name: Release Python package
uses: hsorby/release-python-package-action@v1
uses: hsorby/release-python-package-action@v2
with:
pypi-package-name: cmlibs.argon
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,4 @@ dmypy.json
# Sphinx mock directory
docs/mock/

.idea/
33 changes: 33 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[build-system]
requires = ["setuptools>=61.0", "setuptools_scm>=8.0"]
build-backend = "setuptools.build_meta"

[tool.setuptools-git-versioning]
enabled = true

[project]
name = "cmlibs.argon"
dynamic = ["version"]
keywords = ["Argon", "ArgonDocument", "CMLibs", "Zinc"]
readme = "README.rst"
license = "Apache-2.0"
authors = [
{ name="Hugh Sorby", email="h.sorby@auckland.ac.nz" },
]
dependencies = [
"packaging",
"cmlibs.zinc >= 4.1.3"
]
description = "CMLibs Argon visualisation descriptions."
requires-python = ">=3.8"
classifiers = [
"Programming Language :: Python :: 3",
"Operating System :: OS Independent",
"Topic :: Scientific/Engineering :: Medical Science Apps.",
]

[project.urls]
Homepage = "https://cmlibs.org"
Repository = "https://github.com/CMLibs-Python/cmlibs.argon"

[tool.setuptools_scm]
54 changes: 0 additions & 54 deletions setup.py

This file was deleted.

Empty file removed src/__init__.py
Empty file.
4 changes: 2 additions & 2 deletions src/cmlibs/argon/argondocument.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def _regionChange(self, changedRegion, treeChange):
zincRootRegion = changedRegion.getZincRegion()
self._zincContext.setDefaultRegion(zincRootRegion)

def deserialize(self, state):
def deserialize(self, state, base_path=None):
"""
Read the JSON description to the argon document object. This will change the settings of ArgonDocument Object.

Expand All @@ -145,7 +145,7 @@ def deserialize(self, state):
self._materials.deserialize(d["Materials"])
if "Views" in d:
self._view_manager.deserialize(d["Views"])
self._rootRegion.deserialize(d["RootRegion"])
self._rootRegion.deserialize(d["RootRegion"], base_path)

def serialize(self, base_path=None):
"""
Expand Down
Loading