Skip to content

Commit 3e82260

Browse files
authored
Merge branch 'main' into main
2 parents a4afa39 + 9fa4aac commit 3e82260

13 files changed

Lines changed: 469 additions & 235 deletions

.github/workflows/doctest.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ jobs:
1313
uses: actions/checkout@v3
1414

1515
- name: Setup Conda
16-
uses: conda-incubator/setup-miniconda@v2
16+
uses: conda-incubator/setup-miniconda@v3
1717
with:
1818
python-version: 3.12
1919
activate-environment: doctest-env
2020
environment-file: .github/conda-env/doctest-env.yml
2121
miniforge-version: latest
22-
miniforge-variant: Mambaforge
2322
channels: conda-forge
2423
channel-priority: strict
2524
auto-update-conda: false

.github/workflows/os-blas-test-matrix.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,12 @@ jobs:
120120
fetch-depth: 0
121121
submodules: 'recursive'
122122
- name: Setup Conda
123-
uses: conda-incubator/setup-miniconda@v2
123+
uses: conda-incubator/setup-miniconda@v3
124124
with:
125125
python-version: ${{ matrix.python }}
126126
activate-environment: build-env
127127
environment-file: .github/conda-env/build-env.yml
128128
miniforge-version: latest
129-
miniforge-variant: Mambaforge
130129
channel-priority: strict
131130
auto-update-conda: false
132131
auto-activate-base: false
@@ -292,11 +291,10 @@ jobs:
292291
if: matrix.os == 'macos'
293292
run: brew install coreutils
294293
- name: Setup Conda
295-
uses: conda-incubator/setup-miniconda@v2
294+
uses: conda-incubator/setup-miniconda@v3
296295
with:
297296
python-version: ${{ matrix.python }}
298297
miniforge-version: latest
299-
miniforge-variant: Mambaforge
300298
activate-environment: test-env
301299
environment-file: .github/conda-env/test-env.yml
302300
channel-priority: strict

.github/workflows/python-package-conda.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ jobs:
3232
- uses: actions/checkout@v3
3333

3434
- name: Setup Conda
35-
uses: conda-incubator/setup-miniconda@v2
35+
uses: conda-incubator/setup-miniconda@v3
3636
with:
3737
python-version: ${{ matrix.python-version }}
3838
activate-environment: test-env
3939
environment-file: .github/conda-env/test-env.yml
4040
miniforge-version: latest
41-
miniforge-variant: Mambaforge
4241
channels: conda-forge
4342
channel-priority: strict
4443
auto-update-conda: false

control/canonical.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def similarity_transform(xsys, T, timescale=1, inverse=False):
205205
timescale : float, optional
206206
If present, also rescale the time unit to tau = timescale * t
207207
inverse : bool, optional
208-
If True (default), transform so z = T x. If False, transform
208+
If False (default), transform so z = T x. If True, transform
209209
so x = T z.
210210
211211
Returns

0 commit comments

Comments
 (0)