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.

Sign up for GitHub

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

Jump to bottom

Make synclist task with policy 'exclude' include all versions not just is_latest AAH-485 #783

Merged
merged 4 commits into from
Jul 21, 2021
Merged

Make synclist task with policy 'exclude' include all versions not just is_latest AAH-485 #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5671adc
Just adding CHANGES/585.txt with some notes
alikins May 26, 2021
f8747a6
Notes
alikins May 26, 2021
f9c7a5d
WIP: Set is_highest based on synlist.policy
alikins Jun 1, 2021
922d9a3
Fix synclist include/exclude filter.
rochacbruno Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES/585.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix synclist to exclude all versions of un-checked collection.
9 changes: 7 additions & 2 deletions galaxy_ng/app/tasks/synclist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,21 @@ def curate_synclist_repository(synclist_pk, **kwargs):

namespaces = synclist.namespaces.filter().values_list("name", flat=True)

# include adds only highest version and exclude removes all versions of the collection.
is_highest_query_param = {}
rochacbruno marked this conversation as resolved.
Show resolved Hide resolved
if synclist.policy == 'include':
is_highest_query_param = {"is_highest": True}

collection_versions = CollectionVersion.objects.filter(
Q(
repositories=synclist.upstream_repository,
collection__namespace__in=namespaces,
is_highest=True,
**is_highest_query_param
)
| Q(
collection__in=synclist.collections.all(),
repositories=synclist.repository,
is_highest=True,
**is_highest_query_param
)
)

Expand Down