Skip to content

Commit

Permalink
Add pyproject.toml to take care of build system deps
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobkahn committed Feb 27, 2024
1 parent d6b13f4 commit e2dc777
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
8 changes: 3 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ commands:
name: "Install Build Dependencies"
command: |
sudo apt -y update && \
sudo apt -y install build-essential python3-dev python3-pip python3-venv cmake
sudo apt -y install build-essential python3-dev python3-pip python3-venv
- when:
condition:
equal: ["ON", << parameters.use_kenlm >>]
Expand All @@ -38,9 +38,10 @@ commands:
steps:
- run:
name: "Install Build Dependencies"
# Most of these are KenLM-related
# TODO: remove boost once https://github.com/kpu/kenlm/pull/418 is merged
command: |
brew install cmake googletest boost zlib bzip2 lzip
brew install googletest boost zlib bzip2 lzip
install_msvc_build_dependencies:
steps:
- run:
Expand Down Expand Up @@ -148,9 +149,6 @@ commands:
type: string
default: "ON"
steps:
- run:
name: "Install Python bindings dependencies"
command: pip install wheel numpy cmake
- when:
condition:
equal: ["ON", << parameters.use_kenlm >>]
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[build-system]
requires = ["setuptools", "wheel", "cmake"]
3 changes: 0 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,6 @@ def main():
include=["flashlight.lib.text", "flashlight.lib.text.decoder"],
exclude=["test"],
),
install_requires=[
f"cmake >= {CMAKE_MINIMUM_VERSION[0]}.{CMAKE_MINIMUM_VERSION[1]}"
],
package_dir={"": PACKAGE_DIR},
ext_modules=[
CMakeExtension("flashlight.lib.text.decoder"),
Expand Down

0 comments on commit e2dc777

Please sign in to comment.