Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .docker-compose.env
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ CELERY_BROKER_URL=amqp://guest:guest@rabbitmq:5672
DATABASE_HOST=postgres
ELASTICSEARCH8_URL=https://elastic8:9200/
# ELASTICSEARCH5_URL=http://elasticsearch:9200/
EMBER_SHARE_URL=http://frontend:4200
LOGIN_REDIRECT_URL=http://localhost:8003/
OSF_API_URL=http://localhost:8000
RABBITMQ_HOST=rabbitmq
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
python-version: ['3.10'] # TODO: 3.11, 3.12
postgres-version: ['10', '15']
postgres-version: ['15', '17']
runs-on: ubuntu-latest
services:
postgres:
Expand Down Expand Up @@ -49,13 +49,13 @@ jobs:
- 5672:5672
- 15672:15672
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: install non-py dependencies
run: sudo apt-get update && sudo apt-get install -y libxml2-dev libxslt1-dev libpq-dev git gcc

- name: set up python${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: pip
Expand All @@ -74,14 +74,15 @@ jobs:

- name: run tests
run: |
coverage run -m pytest -x --create-db
coverage run --append -m behave
coverage run -m pytest --create-db
coverage xml -o _shtrove_coverage.xml
env:
DATABASE_PASSWORD: postgres
ELASTICSEARCH8_URL: http://localhost:9208/
# ELASTICSEARCH5_URL: http://localhost:9205/

- name: coveralls
uses: coverallsapp/github-action@v2.3.0
uses: coverallsapp/github-action@v2
with:
coverage-reporter-version: v0.6.9 # avoid broken v0.6.10 -- see https://github.com/coverallsapp/github-action/issues/205
file: _shtrove_coverage.xml
fail-on-error: false
3 changes: 0 additions & 3 deletions api/base/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,9 @@ def initial(self, request, *args, **kwargs):
class RootView(views.APIView):
def get(self, request):
links = {
'normalizeddata': 'api:normalizeddata-list',
'rawdata': 'api:rawdatum-list',
'sourceregistrations': 'api:sourceregistration-list',
'sources': 'api:source-list',
'users': 'api:user-list',
'schema': 'api:schema',
'status': 'api:status',
'rss': 'api:rss',
'atom': 'api:atom',
Expand Down
19 changes: 0 additions & 19 deletions api/formattedmetadatarecords/serializers.py

This file was deleted.

7 changes: 0 additions & 7 deletions api/formattedmetadatarecords/urls.py

This file was deleted.

15 changes: 0 additions & 15 deletions api/formattedmetadatarecords/views.py

This file was deleted.

30 changes: 0 additions & 30 deletions api/normalizeddata/serializers.py

This file was deleted.

7 changes: 0 additions & 7 deletions api/normalizeddata/urls.py

This file was deleted.

108 changes: 0 additions & 108 deletions api/normalizeddata/views.py

This file was deleted.

7 changes: 0 additions & 7 deletions api/schemas/urls.py

This file was deleted.

13 changes: 0 additions & 13 deletions api/schemas/views.py

This file was deleted.

18 changes: 0 additions & 18 deletions api/sourceregistrations/serializers.py

This file was deleted.

7 changes: 0 additions & 7 deletions api/sourceregistrations/urls.py

This file was deleted.

49 changes: 0 additions & 49 deletions api/sourceregistrations/views.py

This file was deleted.

Loading
Loading