Skip to content

Commit 6449b72

Browse files
authored
Make edb_stat_statements buildable separately from server (#129)
1 parent 337eef6 commit 6449b72

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

edgedbpkg/edgedb/__init__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,9 @@ class EdgeDB(packages.BundledPythonPackage):
142142
pgvector.PgVector("v0.6.0"),
143143
pgvector.PgVector("v0.7.4"),
144144
libprotobuf_c.LibProtoBufC("1.5.0"),
145+
edb_stat_statements.StatStatements("v6.0b1"),
145146
]
146147

147-
def __init__(
148-
self, version: str | poetry_version.Version, *args: Any, **kwargs: Any
149-
) -> None:
150-
edb_stat_statements.StatStatements(version=version)
151-
super().__init__(version, *args, **kwargs)
152-
153148
@classmethod
154149
def get_vcs_source(
155150
cls, io: cleo_io.IO, ref: str | None = None

edgedbpkg/pgext/edb_stat_statements/__init__.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,22 @@ class StatStatements(pgext.PostgresCExtension):
1414
license_id = "PostgreSQL"
1515
group = "Applications/Databases"
1616

17-
sources = [] # reuses edgedb-server source, see get_prepare_script
17+
sources = [
18+
{
19+
"url": "git+https://github.com/edgedb/edgedb.git",
20+
"extras": {
21+
"exclude_submodules": ["postgres"],
22+
"clone_depth": 0,
23+
},
24+
},
25+
]
1826

1927
artifact_build_requirements = [
2028
"postgresql-edgedb (>=17)",
2129
]
2230

2331
def get_prepare_script(self, build: targets.Build) -> str:
24-
source_dir = build.get_source_dir(
25-
build.get_package("edgedb-server"), relative_to="pkgbuild"
26-
)
32+
source_dir = build.get_source_dir(self, relative_to="pkgbuild")
2733
sdir = shlex.quote(str(source_dir / "edb_stat_statements"))
2834
return f"test ./ -ef {sdir} || cp -a {sdir}/* ./\n"
2935

0 commit comments

Comments
 (0)