Skip to content

Commit 1d23939

Browse files
authored
Merge branch 'main' into 383-reshape-creates-a-copy-of-the-data-but-shouldnt
2 parents 809f213 + 7c9645d commit 1d23939

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ current or filing a new [issue](https://github.com/sandialabs/pyttb/issues).
2222
2323
Most changes only require dev options
2424
```commandline
25-
pip install -e ".[dev]"
25+
python -m pip install -e ".[dev]"
2626
```
2727
2828
But if you are making larger interface changes or updating tutorials/documentation
2929
you can also add the required packages for documentation.
3030
```commandline
31-
pip install -e ".[dev,doc]"
31+
python -m pip install -e ".[dev,doc]"
3232
```
3333

3434
1. Checkout a branch and make your changes

pyttb/tenmat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ def __mul__(self, other):
512512
if not tshape:
513513
return (self.data @ other.data)[0, 0]
514514
tenmatInstance = tenmat(
515-
self.data @ other.data,
515+
np.matmul(self.data, other.data, order=self.order),
516516
np.arange(len(self.rindices)),
517517
np.arange(len(other.cindices)) + len(self.rindices),
518518
tshape,

tests/test_package.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_linting():
2121
root_dir = os.path.dirname(os.path.dirname(__file__))
2222
toml_file = os.path.join(root_dir, "pyproject.toml")
2323
subprocess.run(
24-
f"ruff check {root_dir} --config {toml_file}",
24+
f'ruff check "{root_dir}" --config "{toml_file}"',
2525
check=True,
2626
shell=True,
2727
)
@@ -32,7 +32,7 @@ def test_formatting():
3232
root_dir = os.path.dirname(os.path.dirname(__file__))
3333
toml_file = os.path.join(root_dir, "pyproject.toml")
3434
subprocess.run(
35-
f"ruff format --check {root_dir} --config {toml_file}",
35+
f'ruff format --check "{root_dir}" --config "{toml_file}"',
3636
check=True,
3737
shell=True,
3838
)
@@ -50,7 +50,7 @@ def test_typing():
5050
root_dir = os.path.dirname(os.path.dirname(__file__))
5151
toml_file = os.path.join(root_dir, "pyproject.toml")
5252
subprocess.run(
53-
f"mypy -p pyttb --config-file {toml_file} {skip_untyped}",
53+
f'mypy -p pyttb --config-file "{toml_file}" {skip_untyped}',
5454
check=True,
5555
shell=True,
5656
)
@@ -61,7 +61,7 @@ def test_spelling():
6161
root_dir = os.path.dirname(os.path.dirname(__file__))
6262
toml_file = os.path.join(root_dir, "pyproject.toml")
6363
subprocess.run(
64-
f"codespell --toml {toml_file}",
64+
f'codespell --toml "{toml_file}"',
6565
check=True,
6666
shell=True,
6767
)

0 commit comments

Comments
 (0)