Skip to content

Commit 223cf60

Browse files
committed
Merge remote-tracking branch 'origin/master' into feat/dpmeta-1237/warn-when-data-type-is-not-parsed
2 parents 9990b77 + dfe9f9c commit 223cf60

File tree

2 files changed

+78
-98
lines changed

2 files changed

+78
-98
lines changed

pyproject.toml

Lines changed: 77 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
[project]
22
name = "ssb-datadoc"
3-
version = "1.5.0"
3+
version = "1.5.1"
44
description = "Document dataset metadata. For use in Statistics Norway's metadata system."
55
readme = "README.md"
66
requires-python = ">=3.12"
77
license = "MIT"
88
authors = [{ name = "Statistics Norway", email = "[email protected]" }]
9-
classifiers = [
10-
"Development Status :: 4 - Beta",
11-
"Framework :: Dash",
12-
"Typing :: Typed"
13-
]
9+
classifiers = ["Development Status :: 4 - Beta", "Framework :: Dash", "Typing :: Typed"]
1410
dependencies = [
15-
"arrow>=1.3.0",
16-
"dapla-toolbelt-metadata>=0.13.0",
17-
"dash>=2.15.0",
18-
"dash-bootstrap-components>=1.1.0",
19-
"flask-healthz>=0.0.3",
20-
"gunicorn>=23.0.0",
21-
"pydantic>=2.5.2",
22-
"python-dotenv>=1.0.1",
23-
"ssb-dash-components>=0.11.1",
11+
"arrow>=1.3.0",
12+
"dapla-toolbelt-metadata>=0.13.0",
13+
"dash>=2.15.0",
14+
"dash-bootstrap-components>=1.1.0",
15+
"flask-healthz>=0.0.3",
16+
"gunicorn>=23.0.0",
17+
"pydantic>=2.5.2",
18+
"python-dotenv>=1.0.1",
19+
"ssb-dash-components>=0.11.1",
2420
]
2521

2622
[project.urls]
@@ -38,34 +34,34 @@ build-backend = "hatchling.build"
3834

3935
[dependency-groups]
4036
dev = [
41-
"coverage[toml]>=6.2",
42-
"deptry>=0.12.0",
43-
"faker>=37.1.0",
44-
"furo>=2021.11.12",
45-
"mypy>=0.950",
46-
"myst-parser>=0.16.1",
47-
"nbstripout>=0.5.0",
48-
"pandas-stubs>=2.2.3.250308",
49-
"pre-commit>=4.2.0",
50-
"pyarrow-stubs>=10.0.1.9",
51-
"pygments>=2.10.0",
52-
"pytest>=7.1.2",
53-
"pytest-cov>=3.0.0",
54-
"pytest-mock>=3.14.0",
55-
"python-kacl>=0.6.3",
56-
"requests-mock>=1.12.1",
57-
"ruff>=0.0.284",
58-
"sphinx>=6.2.1",
59-
"sphinx-autobuild>=2021.3.14",
60-
"sphinx-autodoc-typehints>=1.24.0",
61-
"sphinx-click>=3.0.2",
62-
"tomli>=2.2.1",
63-
"typeguard>=2.13.3",
64-
"types-beautifulsoup4>=4.12.0.20250204",
65-
"types-colorama>=0.4.15.20240311",
66-
"types-pygments>=2.19.0.20250305",
67-
"types-setuptools>=79.0.0.20250422",
68-
"xdoctest[colors]>=0.15.10",
37+
"coverage[toml]>=6.2",
38+
"deptry>=0.12.0",
39+
"faker>=37.1.0",
40+
"furo>=2021.11.12",
41+
"mypy>=0.950",
42+
"myst-parser>=0.16.1",
43+
"nbstripout>=0.5.0",
44+
"pandas-stubs>=2.2.3.250308",
45+
"pre-commit>=4.2.0",
46+
"pyarrow-stubs>=10.0.1.9",
47+
"pygments>=2.10.0",
48+
"pytest>=7.1.2",
49+
"pytest-cov>=3.0.0",
50+
"pytest-mock>=3.14.0",
51+
"python-kacl>=0.6.3",
52+
"requests-mock>=1.12.1",
53+
"ruff>=0.0.284",
54+
"sphinx>=6.2.1",
55+
"sphinx-autobuild>=2021.3.14",
56+
"sphinx-autodoc-typehints>=1.24.0",
57+
"sphinx-click>=3.0.2",
58+
"tomli>=2.2.1",
59+
"typeguard>=2.13.3",
60+
"types-beautifulsoup4>=4.12.0.20250204",
61+
"types-colorama>=0.4.15.20240311",
62+
"types-pygments>=2.19.0.20250305",
63+
"types-setuptools>=79.0.0.20250422",
64+
"xdoctest[colors]>=0.15.10",
6965
]
7066

7167
[tool.hatch.metadata]
@@ -88,9 +84,9 @@ tests = ["tests", "*/tests"]
8884
branch = true
8985
source = ["datadoc_editor"]
9086
omit = [
91-
"src/datadoc_editor/tests/*",
92-
"src/datadoc_editor/__init__.py",
93-
"src/datadoc_editor/frontend/callbacks/register.py",
87+
"src/datadoc_editor/tests/*",
88+
"src/datadoc_editor/__init__.py",
89+
"src/datadoc_editor/frontend/callbacks/register.py",
9490
]
9591
relative_files = true
9692

@@ -110,57 +106,46 @@ exclude = ["docs/conf.py", "noxfile.py", "gunicorn.conf.py"]
110106
[[tool.mypy.overrides]]
111107
# Allow missing type hints in third-party libraries without type information.
112108
module = [
113-
"dash.*",
114-
"dash_bootstrap_components",
115-
"ssb_dash_components",
116-
"flask_healthz",
117-
"dapla",
118-
"gcsfs",
119-
"pyarrow",
120-
"pyarrow.parquet",
121-
"dash.development.base_component",
122-
"pytest_mock",
123-
"dash_extensions",
109+
"dash.*",
110+
"dash_bootstrap_components",
111+
"ssb_dash_components",
112+
"flask_healthz",
113+
"dapla",
114+
"gcsfs",
115+
"pyarrow",
116+
"pyarrow.parquet",
117+
"dash.development.base_component",
118+
"pytest_mock",
119+
"dash_extensions",
124120
]
125121
ignore_missing_imports = true
126122

127123
# Disable specific error codes in the 'tests' package
128124
# Also don't require type annotations
129125
[[tool.mypy.overrides]]
130126
module = ["tests.*"]
131-
disable_error_code = [
132-
"var-annotated",
133-
"has-type",
134-
"no-any-return",
135-
"no-untyped-def"
136-
]
127+
disable_error_code = ["var-annotated", "has-type", "no-any-return", "no-untyped-def"]
137128

138129
[tool.ruff]
139-
force-exclude = true # Apply excludes to pre-commit
130+
force-exclude = true # Apply excludes to pre-commit
140131
show-fixes = true
141132
src = ["src", "tests"]
142-
target-version = "py312" # Minimum Python version supported
133+
target-version = "py312" # Minimum Python version supported
143134
include = ["*.py", "*.pyi", "**/pyproject.toml", "*.ipynb"]
144-
extend-exclude = [
145-
"__pycache__",
146-
"old",
147-
".ipynb_checkpoints",
148-
"noxfile.py",
149-
"docs/conf.py"
150-
]
135+
extend-exclude = ["__pycache__", "old", ".ipynb_checkpoints", "noxfile.py", "docs/conf.py"]
151136

152137
[tool.ruff.lint]
153138
# Ruff rules may be customized as desired: https://docs.astral.sh/ruff/rules/
154139
select = ["ALL"]
155140
ignore = [
156-
"A003",
157-
"B008",
158-
"COM812", # Conflicts with the formatter
159-
"D100", # Suppress undocumented-public-module. Only doc of public api required.
160-
"E501", # Let the formatter handle line length
161-
"TRY003",
162-
"FIX002", # It's OK to use TODOs if they meet the requirements
163-
"PLC2401", # Allow non-ASCII character because of norwegian letters
141+
"A003",
142+
"B008",
143+
"COM812", # Conflicts with the formatter
144+
"D100", # Suppress undocumented-public-module. Only doc of public api required.
145+
"E501", # Let the formatter handle line length
146+
"TRY003",
147+
"FIX002", # It's OK to use TODOs if they meet the requirements
148+
"PLC2401", # Allow non-ASCII character because of norwegian letters
164149
]
165150

166151
[tool.ruff.lint.isort]
@@ -170,31 +155,26 @@ force-single-line = true
170155
max-complexity = 15
171156

172157
[tool.ruff.lint.pydocstyle]
173-
convention = "google" # You can also use "numpy".
158+
convention = "google" # You can also use "numpy".
174159

175160
[tool.ruff.lint.flake8-pytest-style]
176161
fixture-parentheses = false
177162

178163
[tool.ruff.lint.pep8-naming]
179-
classmethod-decorators = [
180-
"classmethod",
181-
"validator",
182-
"root_validator",
183-
"pydantic.validator"
184-
]
164+
classmethod-decorators = ["classmethod", "validator", "root_validator", "pydantic.validator"]
185165

186166
[tool.ruff.lint.per-file-ignores]
187167
"tests/**" = [
188-
"S101", # asserts are encouraged in pytest
189-
"ANN001", # type annotations don't add value for test functions
190-
"ANN002", # type annotations don't add value for test functions
191-
"ANN003", # type annotations don't add value for test functions
192-
"ANN201", # type annotations don't add value for test functions
193-
"ANN204", # type annotations don't add value for test functions
194-
"ANN205", # type annotations don't add value for test functions
195-
"ANN206", # type annotations don't add value for test functions
196-
"D103", # docstrings are overkill for test functions
197-
"D100",
168+
"S101", # asserts are encouraged in pytest
169+
"ANN001", # type annotations don't add value for test functions
170+
"ANN002", # type annotations don't add value for test functions
171+
"ANN003", # type annotations don't add value for test functions
172+
"ANN201", # type annotations don't add value for test functions
173+
"ANN204", # type annotations don't add value for test functions
174+
"ANN205", # type annotations don't add value for test functions
175+
"ANN206", # type annotations don't add value for test functions
176+
"D103", # docstrings are overkill for test functions
177+
"D100",
198178
]
199179
"*/__init__.py" = ["F401"]
200180
"src/datadoc_editor/frontend/callbacks/register_callbacks.py" = ["C901"]

uv.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)