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.

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

V4.y #38

Closed
wants to merge 38 commits into from
Closed

V4.y #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
068bf62
changed the Users/login endpoint to auth/login
LAShemilt Mar 14, 2023
35b2222
Merge remote-tracking branch 'scicat-origin/v4.x' into v4.x
LAShemilt Mar 20, 2023
792dba7
adding some tests to work against a scicat v4 backend.
LAShemilt Mar 16, 2023
3f3f542
Restructured the code so that we can install the optional requiments …
LAShemilt Mar 17, 2023
c7dc17c
moving the extra tests into the new test suite
LAShemilt Mar 17, 2023
9935ad4
deprecating methods that cannot be used in the new backend with the d…
LAShemilt Mar 17, 2023
5a62062
reducing the version of python as 3.8 is not the requirment
LAShemilt Mar 20, 2023
f78b684
porting tests to pyscicat and linting with flake8
LAShemilt Mar 20, 2023
d6f5daf
replacing accidental deletion of error message
LAShemilt Mar 20, 2023
caffcb3
putting the python version to the lowest verions that is built agains…
LAShemilt Mar 20, 2023
21691ad
Removing the forward / before Datasets. If this is given in the endpo…
LAShemilt Apr 19, 2023
b2dde60
testing update dataset now that the getter methods work
LAShemilt Apr 19, 2023
4a1c2c4
move the integration tests out into their own package so they can be …
LAShemilt Apr 19, 2023
e9dfe58
first attempt at an actions workflow to do the integration testing.
LAShemilt Apr 21, 2023
b1514be
changing linting and adding steps
LAShemilt Apr 21, 2023
07573c9
changing linting and adding steps
LAShemilt Apr 21, 2023
50f842d
fixing typo
LAShemilt Apr 21, 2023
338814e
fixing typo
LAShemilt Apr 21, 2023
98ed184
added the old service name as the image name by accident. Updating th…
LAShemilt Apr 21, 2023
7497817
correct name for the scicat backend service
LAShemilt Apr 21, 2023
f14b1a1
adding the deprecation package to the setup requirements
LAShemilt Apr 21, 2023
cfbf891
rename tests_integration.py so that it can be picked up correctly by …
LAShemilt Apr 21, 2023
6ee9be4
adding environmental variables
LAShemilt Apr 21, 2023
893797e
need to install h5py to select tests.
LAShemilt Apr 21, 2023
c536d4a
need to install hdf5 dependencies to select tests.
LAShemilt Apr 21, 2023
7e26ce8
remove subtests dependency
LAShemilt Apr 21, 2023
1291d99
get rid of unnecessary requirement files
LAShemilt May 11, 2023
b373c11
remove deprecation methods and dependency. We have decided to make a …
LAShemilt May 11, 2023
a2b70ed
remove erroneous line in coverage stage of integration-testing.yml
LAShemilt May 11, 2023
2c01354
removing two unused methods
LAShemilt May 11, 2023
d2280e0
replace pip install from requirements-dev.txt with the .[dev] option …
LAShemilt Jun 2, 2023
a8ce9dd
changes to obey flake8 linting
LAShemilt Jun 5, 2023
ade4438
remove unused import from pyscicat
LAShemilt Jun 5, 2023
fb085fb
adding env variables to the workflow
LAShemilt Jun 5, 2023
ab6131b
adding hdf5 dependency and adding full path to integration test
LAShemilt Jun 5, 2023
e150c71
incorrect env variable
LAShemilt Jun 5, 2023
f949284
incorrect env variable and removing nitrosx tests.
LAShemilt Jun 5, 2023
083bc5e
Merge remote-tracking branch 'origin/v4.y' into v4.y
LAShemilt Jun 5, 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
61 changes: 61 additions & 0 deletions .github/workflows/integration-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
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

- name: install dependencies
run: |
set -vxeuo pipefail
python -m pip install .
python -m pip install .[dev]
python -m pip install .[hdf5]
python -m pip list


- name: run tests
env:
BASE_URL: http://localhost:3000/api/v3
SCICAT_USER: ingestor
SCICAT_PASSWORD: aman
run: |
set -vxeuo pipefail
coverage run -m pytest -k tests_integration -v
coverage report
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