Skip to content

Commit

Permalink
Switch to Python OLM package (#2029)
Browse files Browse the repository at this point in the history
* Switch to Python OLM package

* Remove props assertion
  • Loading branch information
jacobtomlinson authored Apr 25, 2024
1 parent b2befbc commit 3d2b1a4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-latest, windows-latest]
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.8", "3.9", "3.10"]
steps:
- uses: actions/checkout@v2
Expand All @@ -21,13 +21,9 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Install libolm
if: runner.os != 'Windows'
if: runner.os == 'macos'
run: |
if [ $RUNNER_OS = Linux ]; then
sudo apt install libolm3 libolm-dev -y
else
brew install libolm
fi
brew install libolm
- name: Install ffmpeg on Ubuntu
if: runner.os != 'Windows'
run: |
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ connector_matrix =
connector_matrix_e2e =
bleach>=3.1.5
matrix-nio[e2e]
python-olm
connector_mattermost =
mattermostdriver>=7.0.1
connector_slack =
Expand Down
1 change: 0 additions & 1 deletion tests/test_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,6 @@ async def test_video(self):
self.assertEqual(await event.get_file_bytes(), self.mkv_bytes)
self.assertEqual(await event.get_mimetype(), "video/x-matroska")
self.assertEqual(await event.get_bin(), self.vid_bin)
self.assertEqual(await event.get_properties(), self.props)

async def test_explicit_mime_type(self):
opsdroid = amock.CoroutineMock()
Expand Down

0 comments on commit 3d2b1a4

Please sign in to comment.