Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/lint_and_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -qy libdw-dev libelf-dev
npm install -g prettier
- name: Install Python dependencies
run: |
python3 -m pip install -r requirements-extra.txt
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ COPY ["requirements-test.txt", "requirements-extra.txt", "requirements-docs.txt"
RUN python3.10 -m venv /venv \
&& /venv/bin/python -m pip install -U pip wheel setuptools cython \
&& /venv/bin/python -m pip install -U -r /tmp/requirements-test.txt -r /tmp/requirements-extra.txt
# RUN npm install -g prettier
# RUN ln -s /opt/bb/bin/clang-format /usr/bin/clang-format

ENV PYTHON=python3.10 \
VIRTUAL_ENV="/venv" \
Expand Down
2 changes: 0 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
exclude .clang-format
exclude .prettierignore
exclude CONTRIBUTING.md
exclude Dockerfile
exclude src/pystack/*.cpp
Expand All @@ -15,7 +14,6 @@ include README.md
include src/pystack/py.typed
include .bumpversion.cfg
include .pre-commit-config.yaml
include .prettierrc.yaml

recursive-include src/pystack/_pystack *
recursive-include src/pystack *.py
Expand Down
2 changes: 0 additions & 2 deletions src/pystack/_pystack/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

include_directories(/opt/bb/include/)

find_package(PythonInterp 3.7 REQUIRED)
find_package(PythonLibs 3.7 REQUIRED)
IF(NOT PYTHONLIBS_FOUND OR NOT PYTHON_EXECUTABLE)
Expand Down
3 changes: 1 addition & 2 deletions tests/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,9 @@ def generate_all_pystack_combinations(
if method == StackMethod.SYMBOLS and not python.has_symbols:
continue

python_id = "bbpy" if "bbpy" in python.path.name else ""
the_id = (
f"method={method.name}, blocking={blocking}, "
f"python={python_id}{major_version}.{minor_version}"
f"python={major_version}.{minor_version}"
)

yield the_id, method, blocking, python[:2]
Expand Down