Skip to content

Commit 27a661c

Browse files
committed
Merge branch 'feature/v0.2.8' into develop
2 parents aa4ae7b + 50a1787 commit 27a661c

File tree

4 files changed

+28
-29
lines changed

4 files changed

+28
-29
lines changed

.coveragerc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ source = colour_datasets
33
sigterm = True
44
[report]
55
exclude_lines =
6-
pragma: no cover
7-
if __name__ == .__main__.:
86
if TYPE_CHECKING:
7+
if __name__ == .__main__.:
8+
if typing.TYPE_CHECKING:
99
pass
10+
pragma: no cover

colour_datasets/loaders/dyer2017.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def schema_version(self) -> str | None:
160160
161161
Returns
162162
-------
163-
:py:data:`None` or :class:`str`
163+
:class:`str` or :py:data:`None`
164164
Schema version.
165165
"""
166166

@@ -190,7 +190,7 @@ def catalog_number(self) -> str | None:
190190
191191
Returns
192192
-------
193-
:py:data:`None` or :class:`str`
193+
:class:`str` or :py:data:`None`
194194
Catalog number.
195195
"""
196196

@@ -220,7 +220,7 @@ def description(self) -> str | None:
220220
221221
Returns
222222
-------
223-
:py:data:`None` or :class:`str`
223+
:class:`str` or :py:data:`None`
224224
Description.
225225
"""
226226

@@ -250,7 +250,7 @@ def document_creator(self) -> str | None:
250250
251251
Returns
252252
-------
253-
:py:data:`None` or :class:`str`
253+
:class:`str` or :py:data:`None`
254254
Document creator.
255255
"""
256256

@@ -280,7 +280,7 @@ def unique_identifier(self) -> str | None:
280280
281281
Returns
282282
-------
283-
:py:data:`None` or :class:`str`
283+
:class:`str` or :py:data:`None`
284284
Unique identifier.
285285
"""
286286

@@ -310,7 +310,7 @@ def measurement_equipment(self) -> str | None:
310310
311311
Returns
312312
-------
313-
:py:data:`None` or :class:`str`
313+
:class:`str` or :py:data:`None`
314314
Measurement equipment.
315315
"""
316316

@@ -340,7 +340,7 @@ def laboratory(self) -> str | None:
340340
341341
Returns
342342
-------
343-
:py:data:`None` or :class:`str`
343+
:class:`str` or :py:data:`None`
344344
Laboratory.
345345
"""
346346

@@ -370,7 +370,7 @@ def document_creation_date(self) -> str | None:
370370
371371
Returns
372372
-------
373-
:py:data:`None` or :class:`str`
373+
:class:`str` or :py:data:`None`
374374
Document creation date.
375375
"""
376376

@@ -400,7 +400,7 @@ def comments(self) -> str | None:
400400
401401
Returns
402402
-------
403-
:py:data:`None` or :class:`str`
403+
:class:`str` or :py:data:`None`
404404
Comments.
405405
"""
406406

@@ -430,7 +430,7 @@ def license(self) -> str | None:
430430
431431
Returns
432432
-------
433-
:py:data:`None` or :class:`str`
433+
:class:`str` or :py:data:`None`
434434
Comments.
435435
"""
436436

@@ -625,7 +625,7 @@ def path(self) -> str | None:
625625
626626
Returns
627627
-------
628-
:py:data:`None` or :class:`str`
628+
:class:`str` or :py:data:`None`
629629
Path.
630630
"""
631631

@@ -700,7 +700,7 @@ def units(
700700
701701
Returns
702702
-------
703-
:py:data:`None` or :class:`str`
703+
:class:`str` or :py:data:`None`
704704
Spectral units.
705705
"""
706706

@@ -765,7 +765,7 @@ def reflection_geometry(
765765
766766
Returns
767767
-------
768-
:py:data:`None` or :class:`str`
768+
:class:`str` or :py:data:`None`
769769
Reflection geometry.
770770
"""
771771

@@ -814,7 +814,7 @@ def transmission_geometry(
814814
815815
Returns
816816
-------
817-
:py:data:`None` or :class:`str`
817+
:class:`str` or :py:data:`None`
818818
Transmission geometry.
819819
"""
820820

@@ -847,7 +847,7 @@ def bandwidth_FWHM(self) -> float | None:
847847
848848
Returns
849849
-------
850-
:py:data:`None` or :class:`numpy.floating`
850+
:class:`float` or :py:data:`None`
851851
Full-width half-maximum bandwidth.
852852
"""
853853

@@ -878,7 +878,7 @@ def bandwidth_corrected(self) -> bool | None:
878878
879879
Returns
880880
-------
881-
:py:data:`None` or :class:`bool`
881+
:class:`bool` or :py:data:`None`
882882
Whether bandwidth correction has been applied to the measured data.
883883
"""
884884

@@ -1129,7 +1129,7 @@ def path(self) -> str | None:
11291129
11301130
Returns
11311131
-------
1132-
:py:data:`None` or :class:`str`
1132+
:class:`str` or :py:data:`None`
11331133
Path.
11341134
"""
11351135

@@ -1204,7 +1204,7 @@ def units(
12041204
12051205
Returns
12061206
-------
1207-
:py:data:`None` or :class:`str`
1207+
:class:`str` or :py:data:`None`
12081208
Spectral units.
12091209
"""
12101210

@@ -1269,7 +1269,7 @@ def reflection_geometry(
12691269
12701270
Returns
12711271
-------
1272-
:py:data:`None` or :class:`str`
1272+
:class:`str` or :py:data:`None`
12731273
Reflection geometry.
12741274
"""
12751275

@@ -1318,7 +1318,7 @@ def transmission_geometry(
13181318
13191319
Returns
13201320
-------
1321-
:py:data:`None` or :class:`str`
1321+
:class:`str` or :py:data:`None`
13221322
Transmission geometry.
13231323
"""
13241324

@@ -1351,7 +1351,7 @@ def bandwidth_FWHM(self) -> float | None:
13511351
13521352
Returns
13531353
-------
1354-
:py:data:`None` or :class:`numpy.floating`
1354+
:class:`float` or :py:data:`None`
13551355
Full-width half-maximum bandwidth.
13561356
"""
13571357

@@ -1382,7 +1382,7 @@ def bandwidth_corrected(self) -> bool | None:
13821382
13831383
Returns
13841384
-------
1385-
:py:data:`None` or :class:`bool`
1385+
:class:`bool` or :py:data:`None`
13861386
Whether bandwidth correction has been applied to the measured data.
13871387
"""
13881388

tasks.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,7 @@ def examples(ctx: Context) -> None:
241241
@task(formatting, quality, precommit, tests, examples)
242242
def preflight(ctx: Context) -> None: # noqa: ARG001
243243
"""
244-
Perform the preflight tasks, i.e., *formatting*, *tests*, *quality*, and
245-
*examples*.
244+
Perform the preflight tasks.
246245
247246
Parameters
248247
----------
@@ -319,8 +318,7 @@ def requirements(ctx: Context) -> None:
319318
@task(clean, preflight, docs, todo, requirements)
320319
def build(ctx: Context) -> None:
321320
"""
322-
Build the project and runs dependency tasks, i.e., *docs*, *todo*, and
323-
*preflight*.
321+
Build the project and runs dependency tasks.
324322
325323
Parameters
326324
----------

utilities/unicode_to_ascii.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ def unicode_to_ascii(root_directory: str) -> None:
6868
if __name__ == "__main__":
6969
os.chdir(os.path.dirname(__file__))
7070

71-
unicode_to_ascii(os.path.join("..", "colour_checker_detection"))
71+
unicode_to_ascii(os.path.join("..", "colour_datasets"))

0 commit comments

Comments
 (0)