Skip to content

Commit 8d0301a

Browse files
antonwolfyantonwolfy
committed
Apply action lint check
1 parent 139aa4a commit 8d0301a

4 files changed

Lines changed: 37 additions & 35 deletions

File tree

‎.github/workflows/build-with-clang.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- name: Build mkl_fft
6666
run: |
6767
source ${{ env.ONEAPI_ROOT }}/setvars.sh
68-
echo $CMPLR_ROOT
68+
echo "$CMPLR_ROOT"
6969
export CC=$CMPLR_ROOT/bin/icx
7070
export CFLAGS="${CFLAGS} -fno-fast-math -O2"
7171
pip install -e . --no-build-isolation --no-deps --verbose

‎.github/workflows/build_pip.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ jobs:
5757
pip install --no-cache-dir numpy ${{ matrix.use_pre }}
5858
echo "CONDA_PREFFIX is '${CONDA_PREFIX}'"
5959
export MKLROOT=${CONDA_PREFIX}
60-
pip install -e .[test] --no-build-isolation --verbose
60+
pip install -e ".[test]" --no-build-isolation --verbose
6161
pip list
6262
python -m pytest -v mkl_fft/tests

‎.github/workflows/conda-package-cf.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
5757
5858
- name: Add conda to system path
59-
run: echo $CONDA/bin >> $GITHUB_PATH
59+
run: echo "$CONDA"/bin >> "$GITHUB_PATH"
6060

6161
- name: Install conda-build
6262
run: conda install conda-build
@@ -69,8 +69,8 @@ jobs:
6969
7070
conda build \
7171
$TEST \
72-
$VERSIONS \
73-
$CHANNELS \
72+
"$VERSIONS" \
73+
"$CHANNELS" \
7474
conda-recipe-cf
7575
7676
- name: Upload artifact
@@ -100,23 +100,23 @@ jobs:
100100
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python_ver }}
101101

102102
- name: Add conda to system path
103-
run: echo $CONDA/bin >> $GITHUB_PATH
103+
run: echo "$CONDA"/bin >> "$GITHUB_PATH"
104104

105105
- name: Install conda-build
106106
run: conda install conda-build
107107

108108
- name: Create conda channel
109109
run: |
110-
mkdir -p $GITHUB_WORKSPACE/channel/linux-64
111-
mv ${PACKAGE_NAME}-*.conda $GITHUB_WORKSPACE/channel/linux-64
112-
conda index $GITHUB_WORKSPACE/channel
110+
mkdir -p "$GITHUB_WORKSPACE"/channel/linux-64
111+
mv "$PACKAGE_NAME"-*.conda "$GITHUB_WORKSPACE"/channel/linux-64
112+
conda index "$GITHUB_WORKSPACE"/channel
113113
# Test channel
114-
conda search $PACKAGE_NAME -c $GITHUB_WORKSPACE/channel --override-channels
114+
conda search "$PACKAGE_NAME" -c "$GITHUB_WORKSPACE"/channel --override-channels
115115
116116
- name: Collect dependencies
117117
run: |
118118
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
119-
conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME python=${{ matrix.python_ver }} ${{ matrix.numpy }} $CHANNELS --only-deps --dry-run > lockfile
119+
conda create -n ${{ env.TEST_ENV_NAME }} "$PACKAGE_NAME" python=${{ matrix.python_ver }} ${{ matrix.numpy }} "$CHANNELS" --only-deps --dry-run > lockfile
120120
121121
- name: Display lockfile
122122
run: cat lockfile
@@ -140,15 +140,15 @@ jobs:
140140
- name: Install mkl_fft
141141
run: |
142142
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
143-
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python_ver }} ${{ matrix.numpy }} $PACKAGE_NAME pytest scipy $CHANNELS
143+
conda create -n ${{ env.TEST_ENV_NAME }} python=${{ matrix.python_ver }} ${{ matrix.numpy }} "$PACKAGE_NAME" pytest scipy "$CHANNELS"
144144
# Test installed packages
145145
conda list -n ${{ env.TEST_ENV_NAME }}
146146
147147
- name: Run tests
148148
run: |
149-
source $CONDA/etc/profile.d/conda.sh
149+
source "$CONDA"/etc/profile.d/conda.sh
150150
conda activate ${{ env.TEST_ENV_NAME }}
151-
pytest -v --pyargs $MODULE_NAME
151+
pytest -v --pyargs "$MODULE_NAME"
152152
153153
build_windows:
154154
runs-on: windows-latest
@@ -208,7 +208,7 @@ jobs:
208208
- name: Store conda paths as envs
209209
shell: bash -l {0}
210210
run: |
211-
echo "CONDA_BLD=$CONDA/conda-bld/win-64/" | tr "\\\\" '/' >> $GITHUB_ENV
211+
echo "CONDA_BLD=$CONDA/conda-bld/win-64/" | tr "\\\\" '/' >> "$GITHUB_ENV"
212212
213213
- name: Upload artifact
214214
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
@@ -244,7 +244,7 @@ jobs:
244244
with:
245245
miniforge-version: latest
246246
activate-environment: ${{ env.TEST_ENV_NAME }}
247-
python-version: ${{ matrix.python }}
247+
python-version: ${{ matrix.python_ver }}
248248
channels: conda-forge
249249
conda-remove-defaults: 'true'
250250

@@ -315,7 +315,7 @@ jobs:
315315
SET PACKAGE_VERSION=%%F
316316
)
317317
SET "TEST_DEPENDENCIES=pytest scipy"
318-
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
318+
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %TEST_DEPENDENCIES% python=${{ matrix.python_ver }} ${{ matrix.numpy }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
319319
320320
- name: Report content of test environment
321321
shell: cmd /C CALL {0}

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

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
4949
5050
- name: Add conda to system path
51-
run: echo $CONDA/bin >> $GITHUB_PATH
51+
run: echo "$CONDA"/bin >> "$GITHUB_PATH"
5252

5353
- name: Install conda-build
5454
run: conda install conda-build
@@ -61,8 +61,8 @@ jobs:
6161
6262
conda build \
6363
$TEST \
64-
$VERSIONS \
65-
$CHANNELS \
64+
"$VERSIONS" \
65+
"$CHANNELS" \
6666
conda-recipe
6767
6868
- name: Upload artifact
@@ -91,32 +91,34 @@ jobs:
9191
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
9292

9393
- name: Add conda to system path
94-
run: echo $CONDA/bin >> $GITHUB_PATH
94+
run: echo "$CONDA"/bin >> "$GITHUB_PATH"
9595

9696
- name: Install conda-build
9797
run: conda install conda-build
9898

9999
- name: Create conda channel
100100
run: |
101-
mkdir -p $GITHUB_WORKSPACE/channel/linux-64
102-
mv ${PACKAGE_NAME}-*.conda $GITHUB_WORKSPACE/channel/linux-64
103-
conda index $GITHUB_WORKSPACE/channel
101+
mkdir -p "$GITHUB_WORKSPACE"/channel/linux-64
102+
mv "$PACKAGE_NAME"-*.conda "$GITHUB_WORKSPACE"/channel/linux-64
103+
conda index "$GITHUB_WORKSPACE"/channel
104104
105105
- name: Test conda channel
106106
run: |
107-
conda search $PACKAGE_NAME -c $GITHUB_WORKSPACE/channel --override-channels --info --json > $GITHUB_WORKSPACE/ver.json
108-
cat $GITHUB_WORKSPACE/ver.json
107+
conda search "$PACKAGE_NAME" -c "$GITHUB_WORKSPACE"/channel --override-channels --info --json > "$GITHUB_WORKSPACE"/ver.json
108+
cat "$GITHUB_WORKSPACE"/ver.json
109109
110110
- name: Get package version
111111
run: |
112-
export PACKAGE_VERSION=$(python -c "${{ env.VER_SCRIPT1 }} ${{ env.VER_SCRIPT2 }}")
113-
echo PACKAGE_VERSION=${PACKAGE_VERSION}
114-
echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> $GITHUB_ENV
112+
PACKAGE_VERSION=$(python -c "${{ env.VER_SCRIPT1 }} ${{ env.VER_SCRIPT2 }}")
113+
export PACKAGE_VERSION
114+
115+
echo PACKAGE_VERSION="${PACKAGE_VERSION}"
116+
echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> "$GITHUB_ENV"
115117
116118
- name: Collect dependencies
117119
run: |
118120
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
119-
conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME python=${{ matrix.python }} $CHANNELS --only-deps --dry-run > lockfile
121+
conda create -n ${{ env.TEST_ENV_NAME }} "$PACKAGE_NAME" python=${{ matrix.python }} "$CHANNELS" --only-deps --dry-run > lockfile
120122
121123
- name: Display lockfile
122124
run: cat lockfile
@@ -140,16 +142,16 @@ jobs:
140142
- name: Install mkl_fft
141143
run: |
142144
CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
143-
conda create -n ${{ env.TEST_ENV_NAME }} $PACKAGE_NAME=${{ env.PACKAGE_VERSION }} python=${{ matrix.python }} pytest $CHANNELS
144-
conda install -n ${{ env.TEST_ENV_NAME }} "scipy>=1.10" $CHANNELS
145+
conda create -n ${{ env.TEST_ENV_NAME }} "$PACKAGE_NAME"=${{ env.PACKAGE_VERSION }} python=${{ matrix.python }} pytest "$CHANNELS"
146+
conda install -n ${{ env.TEST_ENV_NAME }} "scipy>=1.10" "$CHANNELS"
145147
# Test installed packages
146148
conda list -n ${{ env.TEST_ENV_NAME }}
147149
148150
- name: Run tests
149151
run: |
150-
source $CONDA/etc/profile.d/conda.sh
152+
source "$CONDA"/etc/profile.d/conda.sh
151153
conda activate ${{ env.TEST_ENV_NAME }}
152-
pytest -v --pyargs $MODULE_NAME
154+
pytest -v --pyargs "$MODULE_NAME"
153155
154156
build_windows:
155157
runs-on: windows-latest
@@ -203,7 +205,7 @@ jobs:
203205
- name: Store conda paths as envs
204206
shell: bash -l {0}
205207
run: |
206-
echo "CONDA_BLD=$CONDA/conda-bld/win-64/" | tr "\\\\" '/' >> $GITHUB_ENV
208+
echo "CONDA_BLD=$CONDA/conda-bld/win-64/" | tr "\\\\" '/' >> "$GITHUB_ENV"
207209
208210
- name: Upload artifact
209211
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0

0 commit comments

Comments
 (0)