Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 51-update-mesido-and-…
Browse files Browse the repository at this point in the history
…checke-esdl-animation
  • Loading branch information
MarkTNO committed Jul 18, 2024
2 parents 6273929 + 63d74a1 commit 2d3687f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
5 changes: 0 additions & 5 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ packaging==23.2
# via
# build
# pytest
# setuptools-git-versioning
pamqp==3.2.1
# via
# -c requirements.txt
Expand Down Expand Up @@ -255,8 +254,6 @@ scipy==1.10.1
# via
# -c requirements.txt
# rtc-tools
setuptools-git-versioning==1.13.6
# via omotes-grow-worker (pyproject.toml)
six==1.16.0
# via
# -c requirements.txt
Expand All @@ -268,8 +265,6 @@ strenum==0.4.15
# via
# -c requirements.txt
# mesido
toml==0.10.2
# via setuptools-git-versioning
tomli==2.0.1
# via
# black
Expand Down
15 changes: 15 additions & 0 deletions dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM python:3.8-slim-buster

WORKDIR /app

COPY optimizer-worker/requirements.txt /app/grow_worker/requirements.txt
RUN pip install -r /app/grow_worker/requirements.txt --no-cache-dir

COPY ../omotes-sdk-protocol/python/ /omotes-sdk-protocol/python/
COPY ../omotes-sdk-python/ /omotes-sdk-python/
RUN pip install /omotes-sdk-python/
RUN pip install /omotes-sdk-protocol/python/

COPY optimizer-worker/src/grow_worker /app/grow_worker/

CMD ["python3", "-m", "grow_worker.worker"]
5 changes: 0 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ dependencies = [
[project.optional-dependencies]
dev = [
"setuptools ~= 69.0.3",
"setuptools-git-versioning < 2",
"pip-tools ~= 7.3.0",
"black ~= 22.1.0",
"flake8 ~= 6.1.0",
Expand All @@ -59,12 +58,8 @@ build-backend = "setuptools.build_meta"
requires = [
"setuptools ~= 69.0.3",
"wheel ~= 0.40.0",
"setuptools-git-versioning<2",
]

[tool.setuptools-git-versioning]
enabled = true

[tool.pytest.ini_options]
addopts = "--cov=grow_worker --cov-report html --cov-report term-missing --cov-fail-under 15"

Expand Down

0 comments on commit 2d3687f

Please sign in to comment.