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.

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

Jump to bottom

Standardize PyCIEMSS installation across project #34

Merged
merged 3 commits into from
Aug 11, 2023
Merged

Standardize PyCIEMSS installation across project #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b644757
Remove extra group
fivegrant Aug 11, 2023
098411e
Install pyciemss across all environments
fivegrant Aug 11, 2023
6590195
Check if kwargs will satisfy pyciemss func
fivegrant Aug 11, 2023
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: 2 additions & 0 deletions .github/workflows/correctness.yaml
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions docker/Dockerfile.worker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ RUN pip install --no-cache-dir poetry==1.5.1
COPY pyproject.toml pyproject.toml
COPY poetry.lock poetry.lock
RUN poetry config virtualenvs.create false && \
poetry install --no-root --no-cache --extras worker
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
Loading