Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
os: ubuntu
runs_on: ['ubuntu-latest']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
tools_install_dir: ~/miniforge3
build_workspace_dir: build_artifacts
docker_run_args:
steps:

- name: Checkout code
Expand All @@ -37,11 +40,13 @@ jobs:
id: build-linux
if: matrix.os == 'ubuntu'
env:
MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
CONFIG: ${{ matrix.CONFIG }}
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }}
CI: github_actions
CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.CONDA_FORGE_DOCKER_RUN_ARGS }}"
CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.docker_run_args }}"
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
Expand All @@ -61,13 +66,17 @@ jobs:
else
export IS_PR_BUILD="False"
fi
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
echo "::endgroup::"
./.scripts/run_docker_build.sh

- name: Build on macOS
id: build-macos
if: matrix.os == 'macos'
env:
MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
CONFIG: ${{ matrix.CONFIG }}
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
CI: github_actions
Expand All @@ -86,6 +95,8 @@ jobs:
else
export IS_PR_BUILD="False"
fi
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
./.scripts/run_osx_build.sh

- name: Build on windows
Expand All @@ -98,10 +109,8 @@ jobs:
set "sha=%GITHUB_SHA%"
call ".scripts\run_win_build.bat"
env:
# default value; make it explicit, as it needs to match with artefact
# generation below. Not configurable for now, can be revisited later
CONDA_BLD_PATH: C:\bld
MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge
MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
PYTHONUNBUFFERED: 1
CONFIG: ${{ matrix.CONFIG }}
CI: github_actions
Expand Down
2 changes: 1 addition & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 41 additions & 0 deletions recipe/173.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From f31f2b9c82b135a2a5054c68a570a2c32ff7f2a4 Mon Sep 17 00:00:00 2001
From: Sherman Siu <s8siu@uwaterloo.ca>
Date: Sat, 11 Oct 2025 17:35:42 -0400
Subject: [PATCH] Use new colored API

---
spatialmath/baseposematrix.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/spatialmath/baseposematrix.py b/spatialmath/baseposematrix.py
index 87071df3..469fae87 100644
--- a/spatialmath/baseposematrix.py
+++ b/spatialmath/baseposematrix.py
@@ -23,7 +23,7 @@
# colored printing of matrices to the terminal
# colored package has much finer control than colorama, but the latter is available by default with anaconda
try:
- from colored import fg, bg, attr
+ from colored import fore, back, style

_colored = True
# print('using colored output')
@@ -916,12 +916,12 @@ def color(c, f):
else:
return f(c)

- bgcol = color(self._bgcolor, bg)
- trcol = color(self._transcolor, fg) + bgcol
- rotcol = color(self._rotcolor, fg) + bgcol
- constcol = color(self._constcolor, fg) + bgcol
- indexcol = color(self._indexcolor[0], fg) + color(self._indexcolor[1], bg)
- reset = attr(0)
+ bgcol = color(self._bgcolor, back)
+ trcol = color(self._transcolor, fore) + bgcol
+ rotcol = color(self._rotcolor, fore) + bgcol
+ constcol = color(self._constcolor, fore) + bgcol
+ indexcol = color(self._indexcolor[0], fore) + color(self._indexcolor[1], back)
+ reset = style(0)
else:
bgcol = ""
trcol = ""
6 changes: 4 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ package:
source:
url: https://pypi.org/packages/source/{{ name[0] }}/{{ name }}/{{ name.replace('-', '_') }}-{{ version }}.tar.gz
sha256: eb2f043b1c57baab034c01d6d3028eab80f5ec68eaa2ec89cb9572107c336a22
patches:
- 173.patch

build:
number: 0
number: 1
noarch: python
script: {{ PYTHON }} -m pip install . -vv

Expand All @@ -22,7 +24,7 @@ requirements:
- setuptools
run:
- ansitable
- colored <1.5.0
- colored >=2.0.0,<3
- matplotlib-base
- numpy
- python >={{ python_min }}
Expand Down