Skip to content

Commit 24dc2d2

Browse files
authored
Merge pull request #859 from CenterForOpenScience/release/25.2.0
Release/25.2.0 share cleanupgrade (milestone 1: simplify)
2 parents cf198c8 + 150fea7 commit 24dc2d2

File tree

584 files changed

+1610
-36331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

584 files changed

+1610
-36331
lines changed

.docker-compose.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ CELERY_BROKER_URL=amqp://guest:guest@rabbitmq:5672
22
DATABASE_HOST=postgres
33
ELASTICSEARCH8_URL=https://elastic8:9200/
44
# ELASTICSEARCH5_URL=http://elasticsearch:9200/
5-
EMBER_SHARE_URL=http://frontend:4200
65
LOGIN_REDIRECT_URL=http://localhost:8003/
76
OSF_API_URL=http://localhost:8000
87
RABBITMQ_HOST=rabbitmq

.github/workflows/run_tests.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
python-version: ['3.10'] # TODO: 3.11, 3.12
17-
postgres-version: ['10', '15']
17+
postgres-version: ['15', '17']
1818
runs-on: ubuntu-latest
1919
services:
2020
postgres:
@@ -49,13 +49,13 @@ jobs:
4949
- 5672:5672
5050
- 15672:15672
5151
steps:
52-
- uses: actions/checkout@v3
52+
- uses: actions/checkout@v4
5353

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

5757
- name: set up python${{ matrix.python-version }}
58-
uses: actions/setup-python@v4
58+
uses: actions/setup-python@v5
5959
with:
6060
python-version: ${{ matrix.python-version }}
6161
cache: pip
@@ -74,14 +74,15 @@ jobs:
7474

7575
- name: run tests
7676
run: |
77-
coverage run -m pytest -x --create-db
78-
coverage run --append -m behave
77+
coverage run -m pytest --create-db
78+
coverage xml -o _shtrove_coverage.xml
7979
env:
8080
DATABASE_PASSWORD: postgres
8181
ELASTICSEARCH8_URL: http://localhost:9208/
8282
# ELASTICSEARCH5_URL: http://localhost:9205/
8383

8484
- name: coveralls
85-
uses: coverallsapp/github-action@v2.3.0
85+
uses: coverallsapp/github-action@v2
8686
with:
87-
coverage-reporter-version: v0.6.9 # avoid broken v0.6.10 -- see https://github.com/coverallsapp/github-action/issues/205
87+
file: _shtrove_coverage.xml
88+
fail-on-error: false

CHANGELOG.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,42 @@
11
# Change Log
22

3+
# [25.2.0] - 2025-05-05
4+
- further move on from SHAREv2...
5+
- delete sharev2 ingestion pipeline
6+
- share/harvest/*
7+
- share/harvesters/*
8+
- share/metadata_formats/*
9+
- share/regulate/*
10+
- share/schema/*
11+
- share/sources/*
12+
- share/tasks/*
13+
- except `schedule_index_backfill` -- moved to `share.models.index_backfill` for now
14+
- share/transform/*
15+
- share/transformers/*
16+
- anything deactivated by the `ignore_sharev2_ingest` feature flag
17+
- delete (some) sharev2 db models/tables from share/models/...
18+
- core.py: NormalizedData, FormattedMetadataRecord
19+
- jobs.py: HarvestJob
20+
- registration.py: ProviderRegistration
21+
- sources.py: SourceStat
22+
- delete (some) sharev2 api
23+
- /api/v2/formattedmetadatarecords/...
24+
- /api/v2/normalizeddata/...
25+
- note: sharev2 “push” is a POST to this endpoint -- replaced by /trove/ingest
26+
- /api/v2/sourceregistrations/...
27+
- /api/v2/schemas/...
28+
- /api/v1/share/data
29+
- delete `sharectl` (share/bin/*)
30+
- prefer django management commands, for now
31+
- add management commands
32+
- shtrove_indexer_run (replaces `sharectl search daemon`)
33+
- shtrove_search_setup (replaces `sharectl search setup`)
34+
- shtrove_search_teardown (replaces `sharectl search purge`)
35+
- delete_pretrove_data (for letting go of some past)
36+
- remove special ember-share handling (for local dev)
37+
- remove all dead code and requirements easily removed
38+
- update github actions flow (with more accurate code coverage)
39+
340
# [25.1.1] - 2025-03-04
441
- reduce wasteful text-field indexing (better this time)
542
- on the share-admin search-indexes page:

api/base/views.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,9 @@ def initial(self, request, *args, **kwargs):
4545
class RootView(views.APIView):
4646
def get(self, request):
4747
links = {
48-
'normalizeddata': 'api:normalizeddata-list',
4948
'rawdata': 'api:rawdatum-list',
50-
'sourceregistrations': 'api:sourceregistration-list',
5149
'sources': 'api:source-list',
5250
'users': 'api:user-list',
53-
'schema': 'api:schema',
5451
'status': 'api:status',
5552
'rss': 'api:rss',
5653
'atom': 'api:atom',

api/formattedmetadatarecords/serializers.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

api/formattedmetadatarecords/urls.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

api/formattedmetadatarecords/views.py

Lines changed: 0 additions & 15 deletions
This file was deleted.

api/normalizeddata/serializers.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

api/normalizeddata/urls.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

api/normalizeddata/views.py

Lines changed: 0 additions & 108 deletions
This file was deleted.

api/schemas/urls.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

api/schemas/views.py

Lines changed: 0 additions & 13 deletions
This file was deleted.

api/sourceregistrations/serializers.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

api/sourceregistrations/urls.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

api/sourceregistrations/views.py

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)