Skip to content

Commit d22a0b4

Browse files
Merge pull request #32 from conda-forge-admin/conda_forge_admin_31
MNT: rerender
2 parents a4fd7de + 55df0e1 commit d22a0b4

5 files changed

Lines changed: 63 additions & 9 deletions

File tree

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
os: ubuntu
2929
runs_on: ['ubuntu-latest']
3030
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
31+
tools_install_dir: ~/miniforge3
32+
build_workspace_dir: build_artifacts
33+
docker_run_args:
3134
steps:
3235

3336
- name: Checkout code
@@ -37,11 +40,13 @@ jobs:
3740
id: build-linux
3841
if: matrix.os == 'ubuntu'
3942
env:
43+
MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
44+
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
4045
CONFIG: ${{ matrix.CONFIG }}
4146
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
4247
DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }}
4348
CI: github_actions
44-
CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.CONDA_FORGE_DOCKER_RUN_ARGS }}"
49+
CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.docker_run_args }}"
4550
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
4651
FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
4752
STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
@@ -61,13 +66,17 @@ jobs:
6166
else
6267
export IS_PR_BUILD="False"
6368
fi
69+
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
70+
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
6471
echo "::endgroup::"
6572
./.scripts/run_docker_build.sh
6673
6774
- name: Build on macOS
6875
id: build-macos
6976
if: matrix.os == 'macos'
7077
env:
78+
MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
79+
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
7180
CONFIG: ${{ matrix.CONFIG }}
7281
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
7382
CI: github_actions
@@ -86,6 +95,8 @@ jobs:
8695
else
8796
export IS_PR_BUILD="False"
8897
fi
98+
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
99+
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
89100
./.scripts/run_osx_build.sh
90101
91102
- name: Build on windows
@@ -98,10 +109,8 @@ jobs:
98109
set "sha=%GITHUB_SHA%"
99110
call ".scripts\run_win_build.bat"
100111
env:
101-
# default value; make it explicit, as it needs to match with artefact
102-
# generation below. Not configurable for now, can be revisited later
103-
CONDA_BLD_PATH: C:\bld
104-
MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge
112+
MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
113+
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
105114
PYTHONUNBUFFERED: 1
106115
CONFIG: ${{ matrix.CONFIG }}
107116
CI: github_actions

‎.scripts/build_steps.sh‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎recipe/173.patch‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
From f31f2b9c82b135a2a5054c68a570a2c32ff7f2a4 Mon Sep 17 00:00:00 2001
2+
From: Sherman Siu <s8siu@uwaterloo.ca>
3+
Date: Sat, 11 Oct 2025 17:35:42 -0400
4+
Subject: [PATCH] Use new colored API
5+
6+
---
7+
spatialmath/baseposematrix.py | 14 +++++++-------
8+
1 file changed, 7 insertions(+), 7 deletions(-)
9+
10+
diff --git a/spatialmath/baseposematrix.py b/spatialmath/baseposematrix.py
11+
index 87071df3..469fae87 100644
12+
--- a/spatialmath/baseposematrix.py
13+
+++ b/spatialmath/baseposematrix.py
14+
@@ -23,7 +23,7 @@
15+
# colored printing of matrices to the terminal
16+
# colored package has much finer control than colorama, but the latter is available by default with anaconda
17+
try:
18+
- from colored import fg, bg, attr
19+
+ from colored import fore, back, style
20+
21+
_colored = True
22+
# print('using colored output')
23+
@@ -916,12 +916,12 @@ def color(c, f):
24+
else:
25+
return f(c)
26+
27+
- bgcol = color(self._bgcolor, bg)
28+
- trcol = color(self._transcolor, fg) + bgcol
29+
- rotcol = color(self._rotcolor, fg) + bgcol
30+
- constcol = color(self._constcolor, fg) + bgcol
31+
- indexcol = color(self._indexcolor[0], fg) + color(self._indexcolor[1], bg)
32+
- reset = attr(0)
33+
+ bgcol = color(self._bgcolor, back)
34+
+ trcol = color(self._transcolor, fore) + bgcol
35+
+ rotcol = color(self._rotcolor, fore) + bgcol
36+
+ constcol = color(self._constcolor, fore) + bgcol
37+
+ indexcol = color(self._indexcolor[0], fore) + color(self._indexcolor[1], back)
38+
+ reset = style(0)
39+
else:
40+
bgcol = ""
41+
trcol = ""

‎recipe/meta.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ package:
99
source:
1010
url: https://pypi.org/packages/source/{{ name[0] }}/{{ name }}/{{ name.replace('-', '_') }}-{{ version }}.tar.gz
1111
sha256: eb2f043b1c57baab034c01d6d3028eab80f5ec68eaa2ec89cb9572107c336a22
12+
patches:
13+
- 173.patch
1214

1315
build:
14-
number: 0
16+
number: 1
1517
noarch: python
1618
script: {{ PYTHON }} -m pip install . -vv
1719

@@ -22,7 +24,7 @@ requirements:
2224
- setuptools
2325
run:
2426
- ansitable
25-
- colored <1.5.0
27+
- colored >=2.0.0,<3
2628
- matplotlib-base
2729
- numpy
2830
- python >={{ python_min }}

0 commit comments

Comments
 (0)