Skip to content

Release/25.2.0 share cleanupgrade (milestone 1: simplify) #859

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

Merged
merged 34 commits into from
May 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3748b76
update github actions workflow
aaxelb Mar 7, 2025
037f2d5
delete (some) sharev2 api [ENG-7388]
aaxelb Mar 5, 2025
fcade54
delete sharev2 ingest, models [ENG-7389][ENG-7390]
aaxelb Mar 5, 2025
e459607
wip
aaxelb Mar 5, 2025
94962df
wip
aaxelb Mar 6, 2025
d7d7318
wip
aaxelb Mar 6, 2025
64e0701
wipwip
aaxelb Mar 6, 2025
8241e55
wip
aaxelb Mar 6, 2025
e32527b
wip
aaxelb Mar 6, 2025
78a0f73
wip
aaxelb Mar 6, 2025
50caf3c
wip
aaxelb Mar 6, 2025
d8b8dae
get tests passing; remove SourceIcon
aaxelb Mar 7, 2025
f52b1fe
tests.trove.factories
aaxelb Mar 7, 2025
499c915
fix: randomly failing test
aaxelb Mar 7, 2025
75376ea
remove 'behave' run
aaxelb Mar 7, 2025
d456f50
chore: remove ember-share handling [ENG-7392]
aaxelb Mar 11, 2025
49aeda1
trim requirements
aaxelb Mar 11, 2025
adc9b41
wip
aaxelb Mar 12, 2025
ab05415
wip
aaxelb Mar 12, 2025
31322c8
removed share.bin and sharectl and moved to django management commands
bodintsov Mar 12, 2025
d6c863f
reverted changes to changelog, updated docker-compose and moved tests
bodintsov Mar 13, 2025
b0ab372
fixed test_shtrove_commands, fix flake8
bodintsov Mar 13, 2025
2e29fcb
fix: ignore deleted-but-still-indexed items
aaxelb Apr 11, 2025
a5d42a3
tidy up conflict artefacts
aaxelb Apr 11, 2025
a6db718
feat: delete_pretrove_data command
aaxelb Apr 14, 2025
66d4552
keep suids around; delete only rawdata
aaxelb Apr 18, 2025
4f66df7
faster RawDatum bulk-delete (remove downstream CASCADE)
aaxelb Apr 21, 2025
edadaf7
Merge pull request #855 from aaxelb/feat/delete_lotsa_old_data
aaxelb Apr 23, 2025
61884b9
Merge pull request #858 from CenterForOpenScience/feature/share-clean…
aaxelb Apr 23, 2025
c69f5f1
fix: trove sourceconfigs have null transformer_key
aaxelb May 2, 2025
9bfea80
Merge pull request #863 from aaxelb/fix/delete_not_all_data
aaxelb May 2, 2025
3f158c6
chunky delete_pretrove_data (and --chunksize param)
aaxelb May 2, 2025
1a07924
Merge pull request #865 from aaxelb/fix/chunky-delete
aaxelb May 2, 2025
150fea7
prepare 25.2.0
aaxelb May 5, 2025
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
37 changes: 37 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,42 @@
# Change Log

# [25.2.0] - 2025-05-05
- further move on from SHAREv2...
- delete sharev2 ingestion pipeline
- share/harvest/*
- share/harvesters/*
- share/metadata_formats/*
- share/regulate/*
- share/schema/*
- share/sources/*
- share/tasks/*
- except `schedule_index_backfill` -- moved to `share.models.index_backfill` for now
- share/transform/*
- share/transformers/*
- anything deactivated by the `ignore_sharev2_ingest` feature flag
- delete (some) sharev2 db models/tables from share/models/...
- core.py: NormalizedData, FormattedMetadataRecord
- jobs.py: HarvestJob
- registration.py: ProviderRegistration
- sources.py: SourceStat
- delete (some) sharev2 api
- /api/v2/formattedmetadatarecords/...
- /api/v2/normalizeddata/...
- note: sharev2 “push” is a POST to this endpoint -- replaced by /trove/ingest
- /api/v2/sourceregistrations/...
- /api/v2/schemas/...
- /api/v1/share/data
- delete `sharectl` (share/bin/*)
- prefer django management commands, for now
- add management commands
- shtrove_indexer_run (replaces `sharectl search daemon`)
- shtrove_search_setup (replaces `sharectl search setup`)
- shtrove_search_teardown (replaces `sharectl search purge`)
- delete_pretrove_data (for letting go of some past)
- remove special ember-share handling (for local dev)
- remove all dead code and requirements easily removed
- update github actions flow (with more accurate code coverage)

# [25.1.1] - 2025-03-04
- reduce wasteful text-field indexing (better this time)
- on the share-admin search-indexes page:
Expand Down
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