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

DM-40462: Move DbAuth class from daf_butler to utils #885

Merged
merged 2 commits into from
Aug 22, 2023
Merged

DM-40462: Move DbAuth class from daf_butler to utils #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02f426a
Move DbAuth class from daf_butler to utils (DM-40462)
andy-slac Aug 21, 2023
05e3c86
Add news fragment
andy-slac Aug 22, 2023
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 doc/changes/DM-40462.removal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`registry.DbAuth` class has been moved to `utils` package, can be imported from `lsst.utils.db_auth` module.
1 change: 0 additions & 1 deletion python/lsst/daf/butler/registry/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
from ._collection_summary import *
from ._collectionType import *
from ._config import *
from ._dbAuth import *
from ._defaults import *
from ._exceptions import *
from ._registry import *
Expand Down
307 changes: 0 additions & 307 deletions python/lsst/daf/butler/registry/_dbAuth.py
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions python/lsst/daf/butler/registry/connectionString.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@

from typing import TYPE_CHECKING

from lsst.utils.db_auth import DbAuth, DbAuthNotFoundError
from sqlalchemy.engine import url

from ._dbAuth import DbAuth, DbAuthNotFoundError

if TYPE_CHECKING:
from ._config import RegistryConfig

Expand Down
Empty file removed tests/config/dbAuth/badDbAuth1.yaml
View file
Open in desktop
Empty file.
7 changes: 0 additions & 7 deletions tests/config/dbAuth/regMapTest.yaml
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion tests/test_connectionString.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@
import unittest

import lsst.daf.butler.registry.connectionString as ConnectionStringModule
from lsst.daf.butler.registry import DbAuthError, RegistryConfig
from lsst.daf.butler.registry import RegistryConfig
from lsst.daf.butler.registry.connectionString import ConnectionStringFactory
from lsst.utils.db_auth import DbAuthError

TESTDIR = os.path.abspath(os.path.dirname(__file__))

Expand Down