Skip to content

Commit

Permalink
Install pyciemss across all environments
Browse files Browse the repository at this point in the history
  • Loading branch information
fivegrant committed Aug 11, 2023
1 parent b644757 commit 098411e
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/correctness.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@ jobs:
poetry-version: 1.5.1
- name: Create environment
run: poetry install
- name: Install pyciemss
run: poetry run poe install-pyciemss
- name: Pytest
run: poetry run pytest
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ export LANG

# Initializes submodules and copies environment file sample to env file.
.PHONY:init
init:
make envfile; \
poetry run pre-commit install; \
git submodule update --init; \
init: .env
poetry install
poetry run pre-commit install
poetry run poe install-pyciemss


.PHONY:tidy
Expand All @@ -20,7 +20,7 @@ tidy:
poetry run pytest

# Environment file copy
envfile:
.env:
ifeq ($(wildcard envfile),)
cp env.sample .env; \
echo -e "\nDon't forget to update 'envfile' with all your secrets!";
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.worker
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ COPY poetry.lock poetry.lock
RUN poetry config virtualenvs.create false && \
poetry install --no-root --no-cache

RUN pip install --no-cache-dir git+https://github.com/ciemss/pyciemss.git
RUN poetry run poe install-pyciemss
COPY service service
COPY tests tests
COPY README.md README.md
Expand Down
31 changes: 30 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ pytest = "^7.4.0"
pre-commit = "^3.3.3"
requests-mock = "^1.11.0"
mock = "^5.1.0"
poethepoet = "^0.21.1"

[tool.poe.tasks]
install-pyciemss = "pip install git+https://github.com/ciemss/pyciemss.git#c54cff8e301aa53239a9f0e789c8618c3c75569b"

[tool.pytest.ini_options]
python_files = ["tests/tests.py"]
Expand Down

0 comments on commit 098411e

Please sign in to comment.