Skip to content

Commit

Permalink
Merge pull request #40 from rosalindfranklininstitute/v4-datasets
Browse files Browse the repository at this point in the history
V4 datasets
  • Loading branch information
dylanmcreynolds authored Jun 7, 2023
2 parents 03e0628 + a66551b commit 16a5e98
Show file tree
Hide file tree
Showing 20 changed files with 476 additions and 583 deletions.
58 changes: 58 additions & 0 deletions .github/workflows/integration-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Integration tests V4

on:
pull_request:
branches:
- main

jobs:
container_job:
runs-on: ubuntu-latest

services:
mongo:
image: mongo
ports:
- 27107:27107
scicat-backend:
image: ghcr.io/scicatproject/scicat-backend-next:stable
ports:
- 3000:3000
env:
MONGODB_URI: mongodb://mongo:27017/scicat
EXPRESS_SESSION_SECRET: "${EXPRESS_SESSION_SECRET}"
JWT_SECRET: "${JWT_SECRET}"
PORT: 3000
HTTP_MAX_REDIRECTS: 5
HTTP_TIMEOUT: 5000
JWT_EXPIRES_IN: 3600
SITE: SAMPLE-SITE
PID_PREFIX: PID.SAMPLE.PREFIX
DOI_PREFIX: DOI.SAMPLE.PREFIX
METADATA_KEYS_RETURN_LIMIT: 100
METADATA_PARENT_INSTANCES_RETURN_LIMIT: 100
ADMIN_GROUPS: admin,ingestor

steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- run: source continuous_integration/scripts/install.sh


- run: |
set -vxeuo pipefail
python -m pip install .
python -m pip install .[dev]
python -m pip list
- run: |
set -vxeuo pipefail
coverage run -m pytest tests/tests_integration/tests_integration.py
coverage report
env:
BASE_URL: http://localhost:3000/api/v3
SCICAT_USER: ingestor
SCICAT_PASSWORD: aman
2 changes: 1 addition & 1 deletion .github/workflows/publish-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
shell: bash -l {0}
run: |
set -vxeuo pipefail
python -m pip install -r requirements-dev.txt
python -m pip install .[dev]
python -m pip list
- name: Build Docs
shell: bash -l {0}
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ jobs:
shell: bash -l {0}
run: |
set -vxeuo pipefail
python -m pip install -r requirements-dev.txt
python -m pip install .[dev]
python -m pip install .[hdf5]
python -m pip list
- name: Lint with flake8
Expand All @@ -45,5 +46,5 @@ jobs:
shell: bash -l {0}
run: |
set -vxeuo pipefail
coverage run -m pytest -v
coverage run -m pytest --ignore tests_integration -v
coverage report
Loading

0 comments on commit 16a5e98

Please sign in to comment.