Skip to content

build: make cocod dependencies optional #300

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.

Sign up for GitHub

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

Open
ketiltrout wants to merge 1 commit into
base: chime-upgrade
Choose a base branch
from
+10 −9
Open

build: make cocod dependencies optional #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
python-version: ${{ matrix.python_version }}

- name: Install pip dependencies
run: pip install .[test]
run: pip install .[cocod,test]

# - name: Start Redis
# uses: supercharge/redis-github-action@1.8.1
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apt-get update && \
apt-get install -y apt-utils git build-essential curl \
libmariadb-dev libevent-dev && \
pip install --use-deprecated=legacy-resolver flask && \
pip install --use-deprecated=legacy-resolver /coco
pip install --use-deprecated=legacy-resolver /coco[cocod]

#-----------------------
# Minimize container size
Expand Down
3 changes: 2 additions & 1 deletion coco/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from datetime import timedelta
from urllib.parse import urlparse

import msgpack
import yaml

from .exceptions import InternalError
Expand Down Expand Up @@ -328,6 +327,8 @@ def hash_dict(dict_: dict):
-------
Hash
"""
import msgpack

serialized = msgpack.packb(sort_dict(dict_), use_bin_type=True)
_md5 = hashlib.md5()
_md5.update(serialized)
Expand Down
12 changes: 6 additions & 6 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ dynamic = ["readme", "version"]
license = "GPL-3.0-or-later"
license-files = [ "LICENSE" ]
dependencies = [
"comet @ git+https://github.com/chime-experiment/comet.git",
"aiohttp",
"async_timeout",
"click>=8.2",
"pyyaml",
]

[project.optional-dependencies]
cocod = [
"comet @ git+https://github.com/chime-experiment/comet.git",
"deepdiff",
"jinja2",
"mmh3",
"msgpack",
"prometheus_client<0.8",
"pyyaml",
"redis>=4.2.0",
"sanic>=20.6.0"
]

[project.optional-dependencies]
test = [
"fakeredis[lua]",
"pyfakefs >= 5.4",
Expand Down