-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
d9f2cb7
commit 03ca1b8
Showing
4 changed files
with
7 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,8 @@ | ||
<<<<<<< before updating | ||
import sys | ||
from .ioc import create_softioc | ||
from importlib.metadata import version # noqa | ||
|
||
if sys.version_info < (3, 8): | ||
from importlib_metadata import version # noqa | ||
else: | ||
from importlib.metadata import version # noqa | ||
from .ioc import create_softioc | ||
|
||
__version__ = version("pandablocks-ioc") | ||
__version__ = version("PandABlocks-ioc") | ||
del version | ||
======= | ||
from ._version import __version__ | ||
>>>>>>> after updating | ||
|
||
__all__ = ["__version__", "create_softioc"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters