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-39915: Make butler.datastore an internal property #862

Merged
merged 20 commits into from Jul 11, 2023
Merged

Conversation

timj
Copy link
Member

@timj timj commented Jul 6, 2023

Checklist

  • ran Jenkins
  • added a release note for user-visible changes to doc/changes

timj added 2 commits July 10, 2023 07:13
Move the module strings to top of file.
@codecov
Copy link

codecov bot commented Jul 10, 2023

Codecov Report

Patch coverage: 93.08% and project coverage change: -0.01 ⚠️

Comparison is base (ef4fbc5) 87.90% compared to head (39983ba) 87.90%.

❗ Current head 39983ba differs from pull request most recent head 4d40910. Consider uploading reports for the commit 4d40910 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #862      +/-   ##
==========================================
- Coverage   87.90%   87.90%   -0.01%     
==========================================
  Files         270      270              
  Lines       35589    35633      +44     
  Branches     7452     7462      +10     
==========================================
+ Hits        31286    31324      +38     
- Misses       3145     3151       +6     
  Partials     1158     1158              
Impacted Files Coverage Δ
python/lsst/daf/butler/core/persistenceContext.py 59.25% <ø> (ø)
python/lsst/daf/butler/core/quantum.py 87.79% <ø> (ø)
python/lsst/daf/butler/_limited_butler.py 83.58% <72.00%> (-6.22%) ⬇️
python/lsst/daf/butler/_butler.py 78.69% <86.66%> (ø)
python/lsst/daf/butler/_quantum_backed.py 88.77% <100.00%> (ø)
python/lsst/daf/butler/core/composites.py 83.33% <100.00%> (ø)
python/lsst/daf/butler/core/config.py 91.58% <100.00%> (ø)
python/lsst/daf/butler/core/configSupport.py 67.76% <100.00%> (ø)
python/lsst/daf/butler/core/constraints.py 90.38% <100.00%> (ø)
python/lsst/daf/butler/core/datastore.py 94.83% <100.00%> (+0.07%) ⬆️
... and 24 more

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

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 good, few minor comments. I guess you need to figure out why build fails and mypy shows some new errors.

python/lsst/daf/butler/_butler.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/_limited_butler.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/_limited_butler.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/_limited_butler.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/_limited_butler.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/_quantum_backed.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/core/datastore.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/script/queryDatasets.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/_limited_butler.py Show resolved Hide resolved
@timj
Copy link
Member Author

timj commented Jul 10, 2023

The build failing is from fastapi supporting pydantic v2. The mypy failure is all pydantic and we have started a discussion on Slack about it -- it won't block the merge.

@andy-slac
Copy link
Contributor

The mypy failure is all pydantic and we have started a discussion on Slack about it -- it won't block the merge.

I see GA mypy failures in cli/utils.py and cli/cmd/commands.py which I did not see before, maybe new click version?

@andy-slac
Copy link
Contributor

I see GA mypy failures in cli/utils.py and cli/cmd/commands.py which I did not see before, maybe new click version?

Indeed, I see the same errors locally if I upgrade click from 8.1.3 to 8.1.4.

@timj
Copy link
Member Author

timj commented Jul 10, 2023

I see the same errors locally if I upgrade click from 8.1.3 to 8.1.4.

which shows the dangers of having a failing action that we then ignore. I hadn't noticed the click issue.

@timj timj merged commit 50ff5f6 into main Jul 11, 2023
13 of 14 checks passed
@timj timj deleted the tickets/DM-39915 branch July 11, 2023 01:33
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.

None yet

3 participants