Merge branch 'main' into issue-2405-deprecate-cg

.mailmap

@@ -65,9 +65,10 @@ Maurizio Nagni <m.nagni@gmail.com> kusamau <m.nagni@gmail.com>
 Michel Pelletier <michel@graphegon.com> michel <devnull@localhost>
 Mikael Nilsson <mikaeln@google.com> mikael <devnull@localhost>
 Nathan Maynes <nathanmaynes@gmail.com> Nathan M <nathanmaynes@gmail.com>
-Nicholas J. Car <nicholas.car@surroundaustralia.com> Nicholas Car <nicholas.car@csiro.au>
-Nicholas J. Car <nicholas.car@surroundaustralia.com> Nicholas Car <nick@kurrawong.net>
-Nicholas J. Car <nicholas.car@surroundaustralia.com> nicholascar <nicholas.car@surroundaustralia.com>
+Nicholas J. Car <nick@kurrawong.ai> Nicholas Car <nicholas.car@csiro.au>
+Nicholas J. Car <nick@kurrawong.ai> Nicholas Car <nick@kurrawong.net>
+Nicholas J. Car <nick@kurrawong.ai> nicholascar <nicholas.car@surroundaustralia.com>
+Nicholas J. Car <nick@kurrawong.ai> Nicholas Car <nicholas.car@ga.gov.au>
 Niklas Lindström <lindstream@gmail.com> lindstream <devnull@localhost>
 Niklas Lindström <lindstream@gmail.com> Niklas Lindstrom <lindstream@gmail.com>
 Olivier Grisel <olivier.grisel@ensta.org> ogrisel <devnull@localhost>
@@ -98,4 +99,4 @@ William Waites <ww@styx.org> wwaites <ww@styx.org>
 William Waites <ww@styx.org> ww@epsilon.styx.org <ww@epsilon.styx.org>
 Whit Morriss <d.w.morriss@gmail.com> whit <devnull@localhost>
 Zach Lûster <kerncece@gmail.com> kernc <kerncece@gmail.com>
-Zach Lûster <kerncece@gmail.com> Kernc <kerncece@gmail.com>
+Zach Lûster <kerncece@gmail.com> Kernc <kerncece@gmail.com>

Taskfile.yml

@@ -139,14 +139,14 @@ tasks:
     desc: Fix auto-fixable linting errors
     cmds:
       - task: ruff
-        vars: { FIX: true }
+        vars: { FIX: "true" }
       - task: black
 
   lint:
     desc: Perform linting
     cmds:
       - task: black
-        vars: { CHECK: true }
+        vars: { CHECK: "true" }
       - task: ruff
 
   validate:static:
@@ -250,7 +250,7 @@ tasks:
       - task: install:system-deps
       - task: install:tox
         vars:
-          WITH_GITHUB_ACTIONS: true
+          WITH_GITHUB_ACTIONS: "true"
       - cmd: "{{.PYTHON}} -m pip install coveralls"
       - task: tox
         vars:

devtools/requirements-poetry.in

@@ -1,3 +1,3 @@
 # Fixing this here as readthedocs can't use the compiled requirements-poetry.txt
 # due to conflicts.
-poetry==1.8.2
+poetry==1.8.3

docker/latest/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/python:3.12.2-slim@sha256:eb53cb99a609b86da6e239b16e1f2aed5e10cfbc538671fc4631093a00f133f2
+FROM docker.io/library/python:3.12.2-slim@sha256:5c73034c2bc151596ee0f1335610735162ee2b148816710706afec4757ad5b1e
 
 COPY docker/latest/requirements.txt /var/tmp/build/
 

docs/developers.rst

@@ -345,7 +345,7 @@ Some useful commands for working with the task in the taskfile is given below:
     task validate
 
     # Build docs
-    task docs:build
+    task docs
 
     # Run live-preview on the docs
     task docs:live-server

pyproject.toml

@@ -42,7 +42,7 @@ python = "^3.8.1"
 isodate = "^0.6.0"
 pyparsing = ">=2.1.0,<4"
 berkeleydb = {version = "^18.1.0", optional = true}
-networkx = {version = "^2.0.0", optional = true}
+networkx = {version = ">=2,<4", optional = true}
 html5lib = {version = "^1.0", optional = true}
 lxml = {version = "^4.3.0", optional = true}
 

rdflib/namespace/_GEO.py

@@ -26,19 +26,39 @@ class GEO(DefinedNamespace):
     """
 
     # http://www.w3.org/2000/01/rdf-schema#Datatype
+    dggsLiteral: URIRef  # A DGGS serialization of a geometry object.
+    geoJSONLiteral: URIRef  # A GeoJSON serialization of a geometry object.
     gmlLiteral: URIRef  # A GML serialization of a geometry object.
+    kmlLiteral: URIRef  # A KML serialization of a geometry object.
     wktLiteral: URIRef  # A Well-known Text serialization of a geometry object.
 
     # http://www.w3.org/2002/07/owl#Class
     Feature: URIRef  # This class represents the top-level feature type. This class is        equivalent to GFI_Feature defined in ISO 19156:2011, and it is        superclass of all feature types.
+    FeatureCollection: URIRef  # A collection of individual Features.
     Geometry: URIRef  # The class represents the top-level geometry type. This class is        equivalent to the UML class GM_Object defined in ISO 19107, and        it is superclass of all geometry types.
+    GeometryCollection: URIRef  # A collection of individual Geometries.
     SpatialObject: URIRef  # The class spatial-object represents everything that can have        a spatial representation. It is superclass of feature and geometry.
+    SpatialObjectCollection: URIRef  # A collection of individual Spatial Objects.  This is the superclass of Feature Collection and Geometry Collection.
 
     # http://www.w3.org/2002/07/owl#DatatypeProperty
     asGML: URIRef  # The GML serialization of a geometry
     asWKT: URIRef  # The WKT serialization of a geometry
+    asGeoJSON: URIRef  # The GeoJSON serialization of a geometry
+    asKML: URIRef  # The KML serialization of a geometry
+    asDGGS: URIRef  # The DGGS serialization of a geometry
     coordinateDimension: URIRef  # The number of measurements or axes needed to describe the position of this       geometry in a coordinate system.
     dimension: URIRef  # The topological dimension of this geometric object, which        must be less than or equal to the coordinate dimension.        In non-homogeneous collections, this will return the largest        topological dimension of the contained objects.
+    hasMetricArea: URIRef  # The area of a Spatial Object in square meters.
+    hasMetricLength: URIRef  # The length of a Spatial Object in meters.
+    hasMetricPerimeterLength: (
+        URIRef  # The length of the perimeter of a Spatial Object in meters.
+    )
+    hasMetricSpatialAccuracy: URIRef  # The spatial resolution of a Geometry in meters.
+    hasMetricSpatialResolution: (
+        URIRef  # The spatial resolution of a Geometry in meters.
+    )
+    hasMetricSize: URIRef  # Subproperties of this property are used to indicate the size of a Spatial Object as a measurement or estimate of one or more dimensions of the Spatial Object's spatial presence. Units are always metric (meter, square meter or cubic meter)
+    hasMetricVolume: URIRef  # The volume of a Spatial Object in cubic meters.
     hasSerialization: (
         URIRef  # Connects a geometry object with its text-based serialization.
     )
@@ -56,7 +76,21 @@ class GEO(DefinedNamespace):
     ehInside: URIRef  # Exists if the subject SpatialObject is spatially inside        the object SpatialObject. DE-9IM: TFF*FFT**
     ehMeet: URIRef  # Exists if the subject SpatialObject spatially meets the        object SpatialObject.        DE-9IM: FT******* ^ F**T***** ^ F***T****
     ehOverlap: URIRef  # Exists if the subject SpatialObject spatially overlaps the        object SpatialObject. DE-9IM: T*T***T**
+    hasArea: URIRef  # The area of a Spatial Object.
+    hasBoundingBox: (
+        URIRef  # The minimum or smallest bounding or enclosing box of a given Feature.
+    )
+    hasCentroid: URIRef  # The arithmetic mean position of all the geometry points of a given Feature.
+    hasDefaultGeometry: URIRef  # The default geometry to be used in spatial calculations, usually the most detailed geometry.
     hasGeometry: URIRef  # A spatial representation for a given feature.
+    hasLength: URIRef  # The length of a Spatial Object.
+    hasPerimeterLength: URIRef  # The length of the perimeter of a Spatial Object.
+    hasSize: URIRef  #  Subproperties of this property are used to indicate the size of a Spatial Object as a measurement or estimate of one or more dimensions of the Spatial Object's spatial presence.
+    hasSpatialAccuracy: (
+        URIRef  # The positional accuracy of the coordinates of a Geometry.
+    )
+    hasSpatialResolution: URIRef  # The spatial resolution of a Geometry.
+    hasVolume: URIRef  # he volume of a three-dimensional Spatial Object.
     rcc8dc: URIRef  # Exists if the subject SpatialObject is spatially disjoint       from the object SpatialObject. DE-9IM: FFTFFTTTT
     rcc8ec: URIRef  # Exists if the subject SpatialObject spatially meets the        object SpatialObject. DE-9IM: FFTFTTTTT
     rcc8eq: URIRef  # Exists if the subject SpatialObject spatially equals the        object SpatialObject. DE-9IM: TFFFTFFFT

rdflib/plugins/parsers/jsonld.py

@@ -403,9 +403,7 @@ def _parse_container(
                 (
                     dict({GRAPH: o})
                     if k in context.get_keys(NONE)
-                    else dict({ID: k, GRAPH: o})
-                    if isinstance(o, dict)
-                    else o
+                    else dict({ID: k, GRAPH: o}) if isinstance(o, dict) else o
                 )
                 for k, o in obj.items()
             ]

rdflib/plugins/sparql/algebra.py

@@ -1007,8 +1007,6 @@ def convert_node_arg(
                 return node_arg.n3()
         elif isinstance(node_arg, CompValue):
             return "{" + node_arg.name + "}"
-        elif isinstance(node_arg, Expr):
-            return "{" + node_arg.name + "}"
         elif isinstance(node_arg, str):
             return node_arg
         else: