Skip to content

Commit a067d4d

Browse files
authored
Merge pull request #136 from lsst/tickets/DM-45545
DM-45545: Ensure that version.py __all__ is sorted
2 parents 56bcbaf + 754a8b6 commit a067d4d

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/build.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,27 @@ jobs:
1919

2020
- uses: conda-incubator/setup-miniconda@v3
2121
with:
22-
python-version: ${{ matrix.pyversion }}
22+
python-version: ${{ matrix.python-version }}
2323
channels: conda-forge,defaults
24-
miniforge-variant: Miniforge3
25-
use-mamba: true
2624
channel-priority: strict
2725
show-channel-urls: true
2826

2927
- name: Install conda packages used by this package
3028
shell: bash -l {0}
3129
run: |
32-
mamba install -y -q scons eups compilers ruff flake8
30+
conda install -y -q scons eups compilers ruff flake8
3331
3432
# We have two cores so we can speed up the testing with xdist
3533
- name: Install pytest packages
3634
shell: bash -l {0}
3735
run: |
38-
mamba install -y -q \
36+
conda install -y -q \
3937
pytest pytest-xdist pytest-cov pytest-session2file
4038
4139
- name: List installed packages
4240
shell: bash -l {0}
4341
run: |
44-
mamba list
42+
conda list
4543
pip list -v
4644
4745
- name: Build and test

python/lsst/sconsUtils/builders.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ def makeVersionModule(target, source, env):
633633

634634
# Write out an entry per line as there can be many names
635635
outFile.write("__all__ = (\n")
636-
for n in names:
636+
for n in sorted(names):
637637
outFile.write(f' "{n}",\n')
638638
outFile.write(")\n")
639639

0 commit comments

Comments
 (0)