Merge branch 'main' into scipp_pypi

scipp · Dec 3, 2024 · d61c047 · d61c047
2 parents 1e7ba9b + 2ed79d9
commit d61c047
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/template/.github/workflows/docs.yml b/template/.github/workflows/docs.yml
@@ -69,7 +69,7 @@ jobs:
           name: docs_html
           path: html/
 
-      - uses: JamesIves/github-pages-deploy-action@v4.6.9
+      - uses: JamesIves/github-pages-deploy-action@v4.7.1
         if: ${{ inputs.publish }}
         with:
           branch: gh-pages

diff --git a/template/pyproject.toml.jinja b/template/pyproject.toml.jinja
@@ -81,7 +81,6 @@ pydocstyle.convention = "numpy"
 
 [tool.ruff.lint.per-file-ignores]
 # those files have an increased risk of relying on import order
-"__init__.py" = ["I"]
 "tests/*" = [
     "S101",  # asserts are fine in tests
     "B018",  # 'useless expressions' are ok because some tests just check for exceptions

diff --git a/..._package}}{% endif %}/{{ projectname.removeprefix(namespace_package) }}/__init__.py.jinja b/..._package}}{% endif %}/{{ projectname.removeprefix(namespace_package) }}/__init__.py.jinja
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) {{year}} {{orgname|capitalize}} contributors (https://github.com/{{orgname}})
-# ruff: noqa: E402, F401
+# ruff: noqa: E402, F401, I
 
 import importlib.metadata
 

diff --git a/template/src/{% if not namespace_package %}{{projectname}}{% endif %}/__init__.py.jinja b/template/src/{% if not namespace_package %}{{projectname}}{% endif %}/__init__.py.jinja
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright (c) {{year}} {{orgname|capitalize}} contributors (https://github.com/{{orgname}})
-# ruff: noqa: E402, F401
+# ruff: noqa: E402, F401, I
 
 import importlib.metadata