Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove libolm usage & switch to poetry #65

Merged
merged 1 commit into from
Sep 19, 2024
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
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,10 @@
!README.md
!pyproject.toml
!setup.cfg
!poetry.lock
!Cargo.toml
!Cargo.lock
!build_rust.py
!rust

**/__pycache__
27 changes: 16 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,28 @@ jobs:
name: Check code style
runs-on: ubuntu-latest
steps:
- run: sudo apt-get install -y libolm-dev libmagic1
- uses: actions/checkout@v2
- run: sudo apt-get install -y libmagic1
- uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- uses: actions/setup-python@v2
with:
python-version: "3.11"
- run: python -m pip install tox
- run: python -m pip install tox "poetry==1.8.3"
- run: tox -e check_codestyle

check-types:
name: Check types with Mypy
runs-on: ubuntu-latest
steps:
- run: sudo apt-get install -y libolm-dev libmagic1
- uses: actions/checkout@v2
- run: sudo apt-get install -y libmagic1
- uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- uses: actions/setup-python@v2
with:
python-version: "3.11"
- run: python -m pip install tox
- run: python -m pip install tox "poetry==1.8.3"
- run: tox -e check_types

unit-tests:
Expand All @@ -36,13 +40,14 @@ jobs:
matrix:
# Run the unit tests both against our oldest supported Python version
# and the newest stable.
python_version: [ "3.8", "3.11" ]
python_version: [ "3.10", "3.12" ]
steps:
- run: sudo apt-get install -y libolm-dev libmagic1
- uses: actions/checkout@v2
- run: sudo apt-get install -y libmagic1
- uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python_version }}
- run: python -m pip install tox
- run: python -m pip install tox "poetry==1.8.3"
- run: tox -e py

9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,11 @@ config.yaml
/build
/.vscode
mcs_pickle.txt
pickle
pickle

# Poetry will create a setup.py, which we don't want to include.
/setup.py

# rust
/target/
/src/matrix_content_scanner/*.so
Loading
Loading