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

DM-46363: Allow ObscoreExporter to work without SqlRegistry #19

Merged
merged 3 commits into from
Sep 17, 2024

Conversation

dhirving
Copy link
Contributor

Remove a dependency on SqlRegistry in ObscoreExporter, to allow it to work with RemoteButler for the SIAv2 project.

for dataset_type_name in self.config.dataset_types:
_LOG.debug("Reading data for dataset %s", dataset_type_name)
refs = registry.queryDatasets(dataset_type_name, collections=collections, where=self.config.where)
refs = self.butler.registry.queryDatasets(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is rewritten in #18 to use butler.query() but rebasing should be pretty straightforward.

Remove a dependency on SqlRegistry in ObscoreExporter, to allow it to work with RemoteButler.
Copy link

codecov bot commented Sep 16, 2024

Codecov Report

Attention: Patch coverage is 71.42857% with 2 lines in your changes missing coverage. Please review.

Project coverage is 62.03%. Comparing base (dc276c4) to head (40f3db7).
Report is 4 commits behind head on main.

Files with missing lines Patch % Lines
...on/lsst/dax/obscore/script/obscore_update_table.py 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main      #19      +/-   ##
==========================================
- Coverage   62.07%   62.03%   -0.04%     
==========================================
  Files          11       11              
  Lines         472      461      -11     
  Branches      108      107       -1     
==========================================
- Hits          293      286       -7     
+ Misses        169      166       -3     
+ Partials       10        9       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dhirving dhirving marked this pull request as ready for review September 16, 2024 22:30
Copy link
Contributor

@andy-slac andy-slac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. I noticed that mypy.ini needs a small update, I can push it to your branch if you prefer.

@dhirving
Copy link
Contributor Author

dhirving commented Sep 17, 2024

Sure, go ahead and push it.

@andy-slac
Copy link
Contributor

OK, I updated mypy.ini, but I did not re-order things so requirements.txt is in the middle of the history, hope not a big problem. Tim added do_not_merge action on #18, for now it will let you merge even though you said "DO NOT MERGE".

@dhirving dhirving merged commit 6892e05 into main Sep 17, 2024
11 checks passed
@dhirving dhirving deleted the tickets/DM-46363 branch September 17, 2024 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants