Skip to content

Commit eababbc

Browse files
authored
Merge pull request #122 from JaerongA/main
Revert import order
2 parents 623a381 + bd0e76a commit eababbc

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

.pre-commit-config.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ repos:
4444

4545
# these are errors that will be ignored by flake8
4646
# https://www.flake8rules.com/rules/{code}.html
47-
- "--ignore=E203,E501,W503,W605"
47+
- "--ignore=E203,E501,W503,W605,E402"
4848
# E203 - Colons should not have any space before them.
4949
# Needed for list indexing
5050
# E501 - Line lengths are recommended to be no greater than 79 characters.
@@ -54,3 +54,5 @@ repos:
5454
# W605 - a backslash-character pair that is not a valid escape sequence now
5555
# generates a DeprecationWarning. This will eventually become a SyntaxError.
5656
# Needed because we use \d as an escape sequence
57+
# E402 - Place module level import at the top.
58+
# Needed to prevent circular import error

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
44
[Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
55

6-
## [0.2.2] - Unreleased
6+
## [0.2.2] - 2022-01-11
77

8+
+ Bugfix - Revert import order in `__init__.py` to avoid circular import error.
9+
+ Update - `.pre-commit-config.yaml` to disable automatic positioning of import statement at the top.
810
+ Bugfix - Update docstrings to render API for documentation website.
911

1012
## [0.2.1] - 2022-01-06
@@ -70,6 +72,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
7072
+ Add - Probe table supporting: Neuropixels probes 1.0 - 3A, 1.0 - 3B, 2.0 - SS,
7173
2.0 - MS
7274

75+
7376
[0.2.2]: https://github.com/datajoint/element-array-ephys/releases/tag/0.2.2
7477
[0.2.1]: https://github.com/datajoint/element-array-ephys/releases/tag/0.2.1
7578
[0.2.0]: https://github.com/datajoint/element-array-ephys/releases/tag/0.2.0

element_array_ephys/__init__.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1+
"""
2+
isort:skip_file
3+
"""
4+
15
import logging
26
import os
37

48
import datajoint as dj
59

6-
from . import ephys_acute as ephys
710

811
__all__ = ["ephys", "get_logger"]
912

@@ -14,3 +17,6 @@ def get_logger(name):
1417
log = logging.getLogger(name)
1518
log.setLevel(os.getenv("LOGLEVEL", "INFO"))
1619
return log
20+
21+
22+
from . import ephys_acute as ephys

0 commit comments

Comments
 (0)