Skip to content

Commit

Permalink
Merge branch 'main' into 301-test-pyapp-action
Browse files Browse the repository at this point in the history
  • Loading branch information
PeopleMakeCulture authored Feb 1, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents fe963f7 + f44f9ee commit 92ff5c8
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
@@ -39,4 +39,4 @@ jobs:
- name: Test with pytest
run: |
make up-test
make test
make test-run
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@
" # Run in the same directory as this notebook:\n",
" $ cp .notebook.env.example .notebook.env\n",
" ```\n",
"3. Create and populate **MongoDB configuration files** for connecting to the origin (typically, local) and transformer (typically, remote) MongoDB servers.\n",
"3. Create and populate **MongoDB configuration files** for connecting to the origin (typically, remote) and transformer (typically, local) MongoDB servers.\n",
" 1. You can use the `.mongo.yaml.example` file as a template:\n",
" ```shell\n",
" # Run in the same directory as this notebook:\n",
2 changes: 0 additions & 2 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -95,8 +95,6 @@ services:
container_name: test
env_file:
- .env.test
profiles:
- donotstart
depends_on:
- mongo
- fastapi
1 change: 1 addition & 0 deletions nmdc_runtime/test.Dockerfile
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ RUN chmod +x wait-for-it.sh
# Best practices: Prepare for C crashes.
ENV PYTHONFAULTHANDLER=1


# uncomment line below to run all tests
# ENTRYPOINT [ "./wait-for-it.sh", "fastapi:8000" , "--strict" , "--timeout=300" , "--" , "pytest"]

0 comments on commit 92ff5c8

Please sign in to comment.