Skip to content

Commit

Permalink
Trying to fix submodule related build failures
Browse files Browse the repository at this point in the history
  • Loading branch information
astoeckel committed Jun 2, 2019
1 parent d3d0529 commit 0bb5281
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
build
dist
examples/*.cfg
*.egg-info/*
__pycache__
Expand Down
10 changes: 6 additions & 4 deletions nengo_bio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ def _warn_omp_num_threads():
name = "nengo_bio"

# Expose commonly used objects
from nengo_bio.connection import Connection
from nengo_bio.ensemble import Ensemble
from nengo_bio.common import Excitatory, Inhibitory
from .connection import Connection
from .ensemble import Ensemble
from .common import Excitatory, Inhibitory

# Explicitly load the builder submodule to register the builder components
import nengo_bio.builder as builder
from . import (
builder
)
9 changes: 4 additions & 5 deletions nengo_bio/builder/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

name = 'nengo_bio.builder'

# Explicitly load all the sub-modules to register the builder components
import nengo_bio.builder.connection as connection
import nengo_bio.builder.ensemble as ensemble
import nengo_bio.builder.solvers as solvers
from . import (
connection,
ensemble,
)
Empty file removed nengo_bio/builder/solvers.py
Empty file.
1 change: 1 addition & 0 deletions nengo_bio/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

from nengo_bio.common import steal_param, Excitatory, Inhibitory
from nengo_bio.solvers import SolverWrapper, QPSolver

from nengo.params import Parameter, BoolParam, IntParam, StringParam, \
Default, Unconfigurable

Expand Down
1 change: 0 additions & 1 deletion nengo_bio/internal/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

name = 'nengo_bio.internal'

0 comments on commit 0bb5281

Please sign in to comment.