Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ Release History
- Removed
- Fixed

2.0.2 (May 30, 2025)
====================

**Added**

- Support for python 3.13 was added.
- pyproject.toml was added

**Removed**

- setup.py was removed


2.0.1 (unreleased)
==================
Expand Down
Empty file.
2 changes: 1 addition & 1 deletion nengo_spa/ast/symbolic.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def evaluate(self):

@property
def expr(self):
return repr(self.value)
return str(self.value)

@property
def _expr_tree(self):
Expand Down
2 changes: 1 addition & 1 deletion nengo_spa/examine.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def similarity(data, vocab, normalize=False):
elif is_iterable(vocab):
if isinstance(next(iter(vocab)), SemanticPointer):
vocab = [p.v for p in vocab]
vectors = np.array(vocab, copy=False, ndmin=2)
vectors = np.atleast_2d(np.asarray(vocab))
else:
raise ValidationError(
f"{type(vocab).__name__:r} object is not a valid vocabulary", attr="vocab"
Expand Down
4 changes: 2 additions & 2 deletions nengo_spa/modules/tests/test_cortical.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ def test_connect(Simulator, seed):

def test_transform(Simulator, seed):
with spa.Network(seed=seed) as model:
model.buffer1 = spa.State(vocab=32)
model.buffer2 = spa.State(vocab=32)
model.buffer1 = spa.State(vocab=64)
model.buffer2 = spa.State(vocab=64)

spa.sym.A >> model.buffer1
model.buffer1 * spa.sym.B >> model.buffer2
Expand Down
2 changes: 1 addition & 1 deletion nengo_spa/modules/tests/test_thalamus.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ def test_errors():
with pytest.raises(AttributeError):
with spa.Network() as model:
model.vision = spa.State(vocab=16)
with spa.ActionSelection:
with spa.ActionSelection():
spa.ifmax(0.5, spa.sym.A >> model.motor)


Expand Down
5 changes: 3 additions & 2 deletions nengo_spa/networks/tests/test_tvtb.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@ def test_bind(Simulator, seed, rng):

@pytest.mark.parametrize("side", ("left", "right"))
def test_unbind(Simulator, side, seed, rng):
vocab = spa.Vocabulary(36, pointer_gen=rng, algebra=TvtbAlgebra())
vector_dim = 49
vocab = spa.Vocabulary(vector_dim, pointer_gen=rng, algebra=TvtbAlgebra())
vocab.populate("A; B")

with spa.Network(seed=seed) as model:
vtb = TVTB(
100, 36, unbind_left=(side == "left"), unbind_right=(side == "right")
100, vector_dim, unbind_left=(side == "left"), unbind_right=(side == "right")
)

if side == "left":
Expand Down
89 changes: 77 additions & 12 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,81 @@
# Automatically generated by nengo-bones, do not edit this file directly

[build-system]
requires = ["setuptools<64", "wheel"]
requires = ["setuptools>=61.0", "wheel"]
build-backend = "setuptools.build_meta"

[project]
name = "nengo-spa"
dynamic = ["version"]
description = "An implementation of the Semantic Pointer Architecture for Nengo"
readme = "README.rst"
license = { text = "GNU General Public License, version 2" }
authors = [{ name = "Applied Brain Research", email = "info@appliedbrainresearch.com" }]
requires-python = ">=3.5"
dependencies = [
#"nengo @ git+https://github.com/nengo/nengo.git@fix-numpy",
"nengo",
"numpy>=1.13,<=2.2.5",
]

[project.urls]
Homepage = "https://www.nengo.ai/nengo-spa"

[project.optional-dependencies]
all = [
"jupyter<=1.1.1",
"matplotlib>=2.0,<=3.9.4",
"nbsphinx>=0.8.11,<=0.9.7",
"nengo_sphinx_theme<=20.9",
"numpydoc>=1.4.0",
"scipy>=1.4.1,<=1.14.1",
"scikit-learn<=1.6.1",
"jupyter>=1.0.0,<=1.1.1",
"matplotlib>=2.0,<=3.9.4",
"nbformat>=5.0.7,<=5.10.4",
"pytest>=3.6,<=8.3.5",
"pytest-allclose~=1.0.0",
"pytest-plt<=1.1.1",
"pytest-rng<=1.0.0",
]

docs = [
"jupyter<=1.1.1",
"matplotlib>=2.0,<=3.9.4",
"nbsphinx>=0.8.11,<=0.9.7",
"nengo_sphinx_theme<=20.9",
"numpydoc>=1.4.0",
]
optional = [
"scipy>=1.4.1,<=1.13.1",
"scikit-learn<=1.6.1",
]
tests = [
"jupyter>=1.0.0,<=1.1.1",
"matplotlib>=2.0,<=3.9.4",
"nbformat>=5.0.7,<=5.10.4",
"pytest>=3.6,<=8.3.5",
"pytest-allclose~=1.0.0",
"pytest-plt<=1.1.1",
"pytest-rng<=1.0.0",
]


#[project.entry-points."nengo.backends"]
#reference = "nengo:Simulator"
#
#[project.entry-points."pytest11"]
#nengo_spa = "pytest_nengo_spa"

[tool.setuptools.packages.find]
where = ["."]
exclude = ["nengo_spa._vendor"]

[tool.black]
target-version = ['py38']
[tool.setuptools]
zip-safe = false
include-package-data = false
#py-modules = ["pytest_nengo"]

[tool.isort]
profile = "black"
src_paths = ["nengo_spa"]
#[tool.setuptools.package-data]
#nengo = ["nengo-data/nengorc"]

[tool.docformatter]
wrap-summaries = 88
wrap-descriptions = 81
pre-summary-newline = true
[tool.setuptools.dynamic]
version = { attr = "nengo_spa.version.version" }
156 changes: 0 additions & 156 deletions setup.cfg

This file was deleted.

Loading