Skip to content

Commit 6d155e2

Browse files
committed
Merge branch 'update_xcookie' into 'main'
Modernize pyproject.toml and wire airflow as an optional extra See merge request computer-vision/cmd_queue!36
2 parents 41f2d53 + 8566d79 commit 6d155e2

11 files changed

Lines changed: 5992 additions & 1125 deletions

File tree

‎.gitlab-ci.yml‎

Lines changed: 231 additions & 137 deletions
Large diffs are not rendered by default.

‎dev/refresh_locks.sh‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/usr/bin/env bash
2+
# Regenerate uv.lock and the pinned lock files in requirements/locks/.
3+
#
4+
# Run this whenever a dependency in pyproject.toml changes so the
5+
# strict CI variants install the same versions you tested locally.
6+
#
7+
# This script is generated by xcookie; see
8+
# xcookie/main.py:build_refresh_locks_sh. Manual edits will be
9+
# overwritten on the next regeneration.
10+
set -euo pipefail
11+
12+
cd "$(dirname "$0")/.."
13+
14+
uv lock
15+
16+
# Strict CI variant extras: tests
17+
uv export --frozen --no-emit-project --format requirements.txt --no-hashes \
18+
--extra tests \
19+
-o requirements/locks/tests.txt
20+
21+
# Strict CI variant extras: tests, optional, airflow
22+
uv export --frozen --no-emit-project --format requirements.txt --no-hashes \
23+
--extra tests \
24+
--extra optional \
25+
--extra airflow \
26+
-o requirements/locks/tests-optional-airflow.txt

‎dev/setup_secrets.sh‎

Lines changed: 363 additions & 282 deletions
Large diffs are not rendered by default.

‎docs/source/conf.py‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@
111111
# sys.path.insert(0, os.path.abspath('.'))
112112

113113
# -- Project information -----------------------------------------------------
114-
from os.path import dirname, exists, join
115-
116-
import sphinx_rtd_theme
114+
from os.path import exists
115+
from os.path import dirname
116+
from os.path import join
117117

118118

119119
def parse_version(fpath):
@@ -180,6 +180,7 @@ def visit_Assign(self, node):
180180
]
181181

182182
todo_include_todos = True
183+
myst_heading_anchors = 3
183184
napoleon_google_docstring = True
184185
napoleon_use_param = False
185186
napoleon_use_ivar = True
@@ -270,10 +271,12 @@ def visit_Assign(self, node):
270271
# Add any paths that contain templates here, relative to this directory.
271272
templates_path = ['_templates']
272273

273-
# The suffix(es) of source filenames.
274-
# You can specify multiple suffix as a list of string:
275-
#
276-
source_suffix = ['.rst', '.md']
274+
# The suffix(es) of source filenames. Mapping form avoids Sphinx
275+
# converting a legacy list at runtime.
276+
source_suffix = {
277+
'.rst': 'restructuredtext',
278+
'.md': 'markdown',
279+
}
277280

278281
# The master toctree document.
279282
master_doc = 'index'
@@ -300,15 +303,13 @@ def visit_Assign(self, node):
300303
# a list of builtin themes.
301304
#
302305
html_theme = 'sphinx_rtd_theme'
303-
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
304306

305307
# Theme options are theme-specific and customize the look and feel of a theme
306308
# further. For a list of options available for each theme, see the
307309
# documentation.
308310
#
309311
html_theme_options = {
310312
'collapse_navigation': False,
311-
'display_version': True,
312313
'navigation_depth': -1,
313314
# 'logo_only': True,
314315
}
@@ -318,7 +319,10 @@ def visit_Assign(self, node):
318319
# Add any paths that contain custom static files (such as style sheets) here,
319320
# relative to this directory. They are copied after the builtin static files,
320321
# so a file named "default.css" will overwrite the builtin "default.css".
321-
html_static_path = ['_static']
322+
# Keep empty by default to avoid warnings when generated projects do not
323+
# define custom static assets. Projects that create ``docs/source/_static``
324+
# can opt back in locally.
325+
html_static_path = []
322326

323327
# Custom sidebar templates, must be a dictionary that maps document names
324328
# to template names.

0 commit comments

Comments
 (0)