File: alembic-path-separator.patch

package info (click to toggle)
buildbot 4.3.0-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 21,080 kB
  • sloc: python: 174,183; sh: 1,204; makefile: 332; javascript: 119; xml: 16
file content (65 lines) | stat: -rw-r--r-- 2,591 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
From: Colin Watson <cjwatson@debian.org>
Date: Sun, 26 Oct 2025 19:47:41 +0000
Subject: Fix deprecation warning from alembic >= 1.16.0

Following
https://github.com/sqlalchemy/alembic/commit/9913fdb8e20262ccbc34f715b044d36b4be8b5ad,
alembic produces a deprecation warning if we don't set `path_separator`.
This caused test failures in Debian, as seen in
https://bugs.debian.org/1117391.

Forwarded: https://github.com/buildbot/buildbot/pull/8707
Bug-Debian: https://bugs.debian.org/1117391
Last-Update: 2025-10-26
---
 master/buildbot/db/migrations/alembic.ini | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/master/buildbot/db/migrations/alembic.ini b/master/buildbot/db/migrations/alembic.ini
index 4bd8389..616006d 100644
--- a/master/buildbot/db/migrations/alembic.ini
+++ b/master/buildbot/db/migrations/alembic.ini
@@ -8,7 +8,8 @@ script_location = %(here)s/
 file_template = %%(rev)s_%%(year)d-%%(month).2d-%%(day).2d_%%(slug)s
 
 # sys.path path, will be prepended to sys.path if present.
-# defaults to the current working directory.
+# defaults to the current working directory.  for multiple paths, the path separator
+# is defined by "path_separator" below.
 prepend_sys_path = .
 
 # timezone to use when rendering the date
@@ -30,6 +31,33 @@ truncate_slug_length = 40
 
 version_locations = %(here)s/versions
 
+# path_separator; This indicates what character is used to split lists of file
+# paths, including version_locations and prepend_sys_path within configparser
+# files such as alembic.ini.
+# The default rendered in new alembic.ini files is "os", which uses os.pathsep
+# to provide os-dependent path splitting.
+#
+# Note that in order to support legacy alembic.ini files, this default does NOT
+# take place if path_separator is not present in alembic.ini.  If this
+# option is omitted entirely, fallback logic is as follows:
+#
+# 1. Parsing of the version_locations option falls back to using the legacy
+#    "version_path_separator" key, which if absent then falls back to the legacy
+#    behavior of splitting on spaces and/or commas.
+# 2. Parsing of the prepend_sys_path option falls back to the legacy
+#    behavior of splitting on spaces, commas, or colons.
+#
+# Valid values for path_separator are:
+#
+# path_separator = :
+# path_separator = ;
+# path_separator = space
+# path_separator = newline
+#
+# Use os.pathsep. Default configuration used for new projects.
+path_separator = os
+
+
 # the output encoding used when revision files are written from script.py.mako
 output_encoding = utf-8