Skip to content

Commit d58032f

Browse files
authored
Merge branch 'main' into sparql-connector-default-graph
2 parents 9fb30ec + 8dabb87 commit d58032f

File tree

10 files changed

+55
-24
lines changed

10 files changed

+55
-24
lines changed

.mailmap

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,10 @@ Maurizio Nagni <m.nagni@gmail.com> kusamau <m.nagni@gmail.com>
6565
Michel Pelletier <michel@graphegon.com> michel <devnull@localhost>
6666
Mikael Nilsson <mikaeln@google.com> mikael <devnull@localhost>
6767
Nathan Maynes <nathanmaynes@gmail.com> Nathan M <nathanmaynes@gmail.com>
68-
Nicholas J. Car <nicholas.car@surroundaustralia.com> Nicholas Car <nicholas.car@csiro.au>
69-
Nicholas J. Car <nicholas.car@surroundaustralia.com> Nicholas Car <nick@kurrawong.net>
70-
Nicholas J. Car <nicholas.car@surroundaustralia.com> nicholascar <nicholas.car@surroundaustralia.com>
68+
Nicholas J. Car <nick@kurrawong.ai> Nicholas Car <nicholas.car@csiro.au>
69+
Nicholas J. Car <nick@kurrawong.ai> Nicholas Car <nick@kurrawong.net>
70+
Nicholas J. Car <nick@kurrawong.ai> nicholascar <nicholas.car@surroundaustralia.com>
71+
Nicholas J. Car <nick@kurrawong.ai> Nicholas Car <nicholas.car@ga.gov.au>
7172
Niklas Lindström <lindstream@gmail.com> lindstream <devnull@localhost>
7273
Niklas Lindström <lindstream@gmail.com> Niklas Lindstrom <lindstream@gmail.com>
7374
Olivier Grisel <olivier.grisel@ensta.org> ogrisel <devnull@localhost>
@@ -98,4 +99,4 @@ William Waites <ww@styx.org> wwaites <ww@styx.org>
9899
William Waites <ww@styx.org> ww@epsilon.styx.org <ww@epsilon.styx.org>
99100
Whit Morriss <d.w.morriss@gmail.com> whit <devnull@localhost>
100101
Zach Lûster <kerncece@gmail.com> kernc <kerncece@gmail.com>
101-
Zach Lûster <kerncece@gmail.com> Kernc <kerncece@gmail.com>
102+
Zach Lûster <kerncece@gmail.com> Kernc <kerncece@gmail.com>

Taskfile.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,14 @@ tasks:
139139
desc: Fix auto-fixable linting errors
140140
cmds:
141141
- task: ruff
142-
vars: { FIX: true }
142+
vars: { FIX: "true" }
143143
- task: black
144144

145145
lint:
146146
desc: Perform linting
147147
cmds:
148148
- task: black
149-
vars: { CHECK: true }
149+
vars: { CHECK: "true" }
150150
- task: ruff
151151

152152
validate:static:
@@ -250,7 +250,7 @@ tasks:
250250
- task: install:system-deps
251251
- task: install:tox
252252
vars:
253-
WITH_GITHUB_ACTIONS: true
253+
WITH_GITHUB_ACTIONS: "true"
254254
- cmd: "{{.PYTHON}} -m pip install coveralls"
255255
- task: tox
256256
vars:

devtools/requirements-poetry.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Fixing this here as readthedocs can't use the compiled requirements-poetry.txt
22
# due to conflicts.
3-
poetry==1.8.2
3+
poetry==1.8.3

docs/developers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ Some useful commands for working with the task in the taskfile is given below:
345345
task validate
346346
347347
# Build docs
348-
task docs:build
348+
task docs
349349
350350
# Run live-preview on the docs
351351
task docs:live-server

poetry.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ python = "^3.8.1"
4242
isodate = "^0.6.0"
4343
pyparsing = ">=2.1.0,<4"
4444
berkeleydb = {version = "^18.1.0", optional = true}
45-
networkx = {version = "^2.0.0", optional = true}
45+
networkx = {version = ">=2,<4", optional = true}
4646
html5lib = {version = "^1.0", optional = true}
4747
lxml = {version = "^4.3.0", optional = true}
4848

rdflib/namespace/_GEO.py

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,39 @@ class GEO(DefinedNamespace):
2626
"""
2727

2828
# http://www.w3.org/2000/01/rdf-schema#Datatype
29+
dggsLiteral: URIRef # A DGGS serialization of a geometry object.
30+
geoJSONLiteral: URIRef # A GeoJSON serialization of a geometry object.
2931
gmlLiteral: URIRef # A GML serialization of a geometry object.
32+
kmlLiteral: URIRef # A KML serialization of a geometry object.
3033
wktLiteral: URIRef # A Well-known Text serialization of a geometry object.
3134

3235
# http://www.w3.org/2002/07/owl#Class
3336
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.
37+
FeatureCollection: URIRef # A collection of individual Features.
3438
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.
39+
GeometryCollection: URIRef # A collection of individual Geometries.
3540
SpatialObject: URIRef # The class spatial-object represents everything that can have a spatial representation. It is superclass of feature and geometry.
41+
SpatialObjectCollection: URIRef # A collection of individual Spatial Objects. This is the superclass of Feature Collection and Geometry Collection.
3642

3743
# http://www.w3.org/2002/07/owl#DatatypeProperty
3844
asGML: URIRef # The GML serialization of a geometry
3945
asWKT: URIRef # The WKT serialization of a geometry
46+
asGeoJSON: URIRef # The GeoJSON serialization of a geometry
47+
asKML: URIRef # The KML serialization of a geometry
48+
asDGGS: URIRef # The DGGS serialization of a geometry
4049
coordinateDimension: URIRef # The number of measurements or axes needed to describe the position of this geometry in a coordinate system.
4150
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.
51+
hasMetricArea: URIRef # The area of a Spatial Object in square meters.
52+
hasMetricLength: URIRef # The length of a Spatial Object in meters.
53+
hasMetricPerimeterLength: (
54+
URIRef # The length of the perimeter of a Spatial Object in meters.
55+
)
56+
hasMetricSpatialAccuracy: URIRef # The spatial resolution of a Geometry in meters.
57+
hasMetricSpatialResolution: (
58+
URIRef # The spatial resolution of a Geometry in meters.
59+
)
60+
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)
61+
hasMetricVolume: URIRef # The volume of a Spatial Object in cubic meters.
4262
hasSerialization: (
4363
URIRef # Connects a geometry object with its text-based serialization.
4464
)
@@ -56,7 +76,21 @@ class GEO(DefinedNamespace):
5676
ehInside: URIRef # Exists if the subject SpatialObject is spatially inside the object SpatialObject. DE-9IM: TFF*FFT**
5777
ehMeet: URIRef # Exists if the subject SpatialObject spatially meets the object SpatialObject. DE-9IM: FT******* ^ F**T***** ^ F***T****
5878
ehOverlap: URIRef # Exists if the subject SpatialObject spatially overlaps the object SpatialObject. DE-9IM: T*T***T**
79+
hasArea: URIRef # The area of a Spatial Object.
80+
hasBoundingBox: (
81+
URIRef # The minimum or smallest bounding or enclosing box of a given Feature.
82+
)
83+
hasCentroid: URIRef # The arithmetic mean position of all the geometry points of a given Feature.
84+
hasDefaultGeometry: URIRef # The default geometry to be used in spatial calculations, usually the most detailed geometry.
5985
hasGeometry: URIRef # A spatial representation for a given feature.
86+
hasLength: URIRef # The length of a Spatial Object.
87+
hasPerimeterLength: URIRef # The length of the perimeter of a Spatial Object.
88+
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.
89+
hasSpatialAccuracy: (
90+
URIRef # The positional accuracy of the coordinates of a Geometry.
91+
)
92+
hasSpatialResolution: URIRef # The spatial resolution of a Geometry.
93+
hasVolume: URIRef # he volume of a three-dimensional Spatial Object.
6094
rcc8dc: URIRef # Exists if the subject SpatialObject is spatially disjoint from the object SpatialObject. DE-9IM: FFTFFTTTT
6195
rcc8ec: URIRef # Exists if the subject SpatialObject spatially meets the object SpatialObject. DE-9IM: FFTFTTTTT
6296
rcc8eq: URIRef # Exists if the subject SpatialObject spatially equals the object SpatialObject. DE-9IM: TFFFTFFFT

rdflib/plugins/parsers/jsonld.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,9 +403,7 @@ def _parse_container(
403403
(
404404
dict({GRAPH: o})
405405
if k in context.get_keys(NONE)
406-
else dict({ID: k, GRAPH: o})
407-
if isinstance(o, dict)
408-
else o
406+
else dict({ID: k, GRAPH: o}) if isinstance(o, dict) else o
409407
)
410408
for k, o in obj.items()
411409
]

rdflib/plugins/sparql/algebra.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,8 +1007,6 @@ def convert_node_arg(
10071007
return node_arg.n3()
10081008
elif isinstance(node_arg, CompValue):
10091009
return "{" + node_arg.name + "}"
1010-
elif isinstance(node_arg, Expr):
1011-
return "{" + node_arg.name + "}"
10121010
elif isinstance(node_arg, str):
10131011
return node_arg
10141012
else:
-20 KB
Binary file not shown.

0 commit comments

Comments
 (0)