Skip to content

Commit

Permalink
Update project files to account for the dependency on lz4
Browse files Browse the repository at this point in the history
As we depend now on the development version of the `lz4` library we need
to update the CI, the build files and the README to account for this.

Signed-off-by: Pablo Galindo <pablogsal@gmail.com>
  • Loading branch information
pablogsal committed May 12, 2022
1 parent d3e8e45 commit 0413e75
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Set up dependencies
run: |
sudo apt-get update
sudo apt-get install -qy libunwind-dev pkg-config npm
sudo apt-get install -qy libunwind-dev liblz4-dev pkg-config npm
- name: Install Python dependencies
run: |
python3 -m pip install --upgrade pip
Expand All @@ -68,7 +68,7 @@ jobs:
- uses: actions/checkout@v2
- name: Set up dependencies
run: |
apk add --update build-base libunwind-dev musl-dev python3-dev
apk add --update build-base libunwind-dev lz4-dev musl-dev python3-dev
- name: Install Python dependencies
run: |
python3 -m pip install --upgrade pip
Expand All @@ -90,7 +90,7 @@ jobs:
- name: Set up dependencies
run: |
sudo apt-get update
sudo apt-get install -qy clang-format npm libunwind-dev pkg-config
sudo apt-get install -qy clang-format npm libunwind-dev liblz4-dev pkg-config
npm install -g prettier
- name: Install Python dependencies
run: |
Expand All @@ -117,7 +117,7 @@ jobs:
- name: Set up dependencies
run: |
sudo apt-get update
sudo apt-get install -qy libunwind-dev pkg-config npm valgrind
sudo apt-get install -qy libunwind-dev liblz4-dev pkg-config npm valgrind
- name: Install Python dependencies and package
run: |
python3 -m pip install --upgrade pip
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ system where you are doing the installation.
If you wish to build Memray from source you need the following binary dependencies in your system:

- libunwind
- liblz4

Check your package manager on how to install these dependencies (for example `apt-get install libunwind-dev` in Debian-based systems).
Check your package manager on how to install these dependencies (for example `apt-get install libunwind-dev liblz4-dev` in Debian-based systems).

Once you have the binary dependencies installed, you can clone the repository and follow with the normal building process:

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ build = ["cp37-*", "cp38-*", "cp39-*", "cp310-*"]
skip = "*musllinux*"

[tool.cibuildwheel.linux]
before-all = "yum install -y libunwind-devel"
before-all = "yum install -y libunwind-devel lz4-devel"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def build_js_files(self):
"src/memray/_memray/socket_reader_thread.cpp",
"src/memray/_memray/native_resolver.cpp",
],
libraries=["unwind"],
libraries=["unwind", "lz4"],
library_dirs=[str(LIBBACKTRACE_LIBDIR)],
include_dirs=["src", str(LIBBACKTRACE_INCLUDEDIRS)],
language="c++",
Expand Down

0 comments on commit 0413e75

Please sign in to comment.