Skip to content

Commit

Permalink
Fix for new EdgeDB dependencies (#104)
Browse files Browse the repository at this point in the history
* Bump OpenSSL and libffi versions
* Support maturin-built packages
  • Loading branch information
fantix authored Aug 12, 2024
1 parent 7f3a0c0 commit ed10d74
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
17 changes: 17 additions & 0 deletions edgedbpkg/edgedb/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ def get_package_repository(
repo.register_package_impl("cffi", Cffi)
repo.register_package_impl("jwcrypto", JWCrypto)
repo.register_package_impl("edgedb", EdgeDBPython)
repo.register_package_impl("maturin", Maturin)
repo.register_package_impl("pydantic-core", PyPackageNeedingMaturin)
repo.register_package_impl("rpds-py", PyPackageNeedingMaturin)
return repo

@property
Expand Down Expand Up @@ -589,3 +592,17 @@ def get_file_no_install_entries(self, build: targets.Build) -> list[str]:
entries = super().get_file_no_install_entries(build)
entries.append("{bindir}/*")
return entries


class Maturin(packages.PythonPackage):
executable = "maturin"

def get_build_tools(self, build: targets.Build) -> dict[str, pathlib.Path]:
install_dir = build.get_install_dir(self, relative_to="sourceroot")
bin_dir = build.get_install_path("bin").relative_to("/")
return {self.executable: install_dir / bin_dir / "maturin"}


class PyPackageNeedingMaturin(packages.PythonPackage):
def get_dep_commands(self) -> list[str]:
return [Maturin.executable]
4 changes: 2 additions & 2 deletions edgedbpkg/python/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ class Python(packages.BundledCPackage):
]

bundle_deps = [
openssl.OpenSSL("3.1.5"),
openssl.OpenSSL("3.3.1"),
libb2.LibB2("0.98.1"),
libffi.LibFFI("3.4.4"),
libffi.LibFFI("3.4.6"),
libuuid.LibUUID("2.39.3"),
zlib.Zlib("1.3.1"),
]
Expand Down

0 comments on commit ed10d74

Please sign in to comment.