Skip to content

Commit 38c5c26

Browse files
dependabot[bot]Xuwznln
dependabot[bot]
authored and
Xuwznln
committed
Fix Conda Build
ci(deps): bump actions/checkout from 4 to 6 (#223) Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ci(deps): bump actions/upload-pages-artifact from 3 to 4 (#225) Bumps [actions/upload-pages-artifact](https://github.com/actions/upload-pages-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-pages-artifact/releases) - [Commits](actions/upload-pages-artifact@v3...v4) --- updated-dependencies: - dependency-name: actions/upload-pages-artifact dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ci(deps): bump actions/upload-artifact from 4 to 6 (#224) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v4...v6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ci(deps): bump actions/configure-pages from 4 to 5 (#222) Bumps [actions/configure-pages](https://github.com/actions/configure-pages) from 4 to 5. - [Release notes](https://github.com/actions/configure-pages/releases) - [Commits](actions/configure-pages@v4...v5) --- updated-dependencies: - dependency-name: actions/configure-pages dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 2a5ddd6 commit 38c5c26

16 files changed

Lines changed: 83 additions & 22 deletions

File tree

‎.conda/base/recipe.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ build:
2626
- cp $RECIPE_DIR/../../MANIFEST.in $SRC_DIR
2727
- cp $RECIPE_DIR/../../setup.cfg $SRC_DIR
2828
- cp $RECIPE_DIR/../../setup.py $SRC_DIR
29-
- uv pip install $SRC_DIR
29+
- pip install $SRC_DIR
3030

3131
requirements:
3232
host:
@@ -52,6 +52,7 @@ requirements:
5252
- pandas
5353
- pymodbus
5454
- matplotlib
55+
- pylibftdi
5556
- uni-lab::unilabos-env ==0.10.16
5657

5758
about:

‎.conda/environment/recipe.yaml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# unilabos-env: conda environment dependencies (ROS2 + conda packages)
2+
3+
package:
4+
name: unilabos-env
5+
version: 0.10.16
6+
7+
build:
8+
noarch: generic
9+
10+
requirements:
11+
run:
12+
# Python
13+
- zstd
14+
- zstandard
15+
- conda-forge::python ==3.11.14
16+
- conda-forge::opencv
17+
# ROS2 dependencies (from ci-check.yml)
18+
- robostack-staging::ros-humble-ros-core
19+
- robostack-staging::ros-humble-action-msgs
20+
- robostack-staging::ros-humble-std-msgs
21+
- robostack-staging::ros-humble-geometry-msgs
22+
- robostack-staging::ros-humble-control-msgs
23+
- robostack-staging::ros-humble-nav2-msgs
24+
- robostack-staging::ros-humble-cv-bridge
25+
- robostack-staging::ros-humble-vision-opencv
26+
- robostack-staging::ros-humble-tf-transformations
27+
- robostack-staging::ros-humble-moveit-msgs
28+
- robostack-staging::ros-humble-tf2-ros
29+
- robostack-staging::ros-humble-tf2-ros-py
30+
- conda-forge::transforms3d
31+
- conda-forge::uv
32+
33+
# UniLabOS custom messages
34+
- uni-lab::ros-humble-unilabos-msgs
35+
36+
about:
37+
repository: https://github.com/deepmodeling/Uni-Lab-OS
38+
license: GPL-3.0-only
39+
description: "UniLabOS Environment - ROS2 and conda dependencies (for developers: pip install -e .)"

‎.conda/full/recipe.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# unilabos-full: Full package with all features
1+
# unilabos-full: Full package with all features
22
# Depends on unilabos + complete ROS2 desktop + dev tools
33

44
package:

‎.github/workflows/ci-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
shell: cmd
2121

2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v6
2424
with:
2525
fetch-depth: 0
2626

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
echo "should_build=false" >> $GITHUB_OUTPUT
6363
fi
6464
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v6
6666
if: steps.should_build.outputs.should_build == 'true'
6767
with:
6868
ref: ${{ github.event.inputs.branch }}
@@ -312,7 +312,7 @@ jobs:
312312
313313
- name: Upload distribution package
314314
if: steps.should_build.outputs.should_build == 'true'
315-
uses: actions/upload-artifact@v4
315+
uses: actions/upload-artifact@v6
316316
with:
317317
name: unilab-pack-${{ matrix.platform }}-${{ github.event.inputs.branch }}
318318
path: dist-package/

‎.github/workflows/deploy-docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
steps:
4646
- name: Checkout code
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v6
4848
with:
4949
# workflow_run 时使用触发工作流的分支，手动触发时使用输入的分支
5050
ref: ${{ github.event.workflow_run.head_branch || github.event.inputs.branch || github.ref }}
@@ -84,7 +84,7 @@ jobs:
8484
8585
- name: Setup Pages
8686
id: pages
87-
uses: actions/configure-pages@v4
87+
uses: actions/configure-pages@v5
8888
if: |
8989
github.event.workflow_run.head_branch == 'main' ||
9090
(github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_pages == 'true')
@@ -105,7 +105,7 @@ jobs:
105105
test -f docs/_build/html/index.html && echo "✓ index.html exists" || echo "✗ index.html missing"
106106
107107
- name: Upload build artifacts
108-
uses: actions/upload-pages-artifact@v3
108+
uses: actions/upload-pages-artifact@v4
109109
if: |
110110
github.event.workflow_run.head_branch == 'main' ||
111111
(github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_to_pages == 'true')

‎.github/workflows/multi-platform-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
shell: bash -l {0}
7878

7979
steps:
80-
- uses: actions/checkout@v4
80+
- uses: actions/checkout@v6
8181
with:
8282
# 如果是 workflow_run 触发，使用触发 CI Check 的 commit
8383
ref: ${{ github.event.workflow_run.head_sha || github.ref }}
@@ -149,7 +149,7 @@ jobs:
149149
150150
- name: Upload conda package artifacts
151151
if: steps.should_build.outputs.should_build == 'true'
152-
uses: actions/upload-artifact@v4
152+
uses: actions/upload-artifact@v6
153153
with:
154154
name: conda-package-${{ matrix.platform }}
155155
path: conda-packages-temp

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

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
shell: bash -l {0}
7878

7979
steps:
80-
- uses: actions/checkout@v4
80+
- uses: actions/checkout@v6
8181
with:
8282
# 如果是 workflow_run 触发，使用触发 CI Check 的 commit
8383
ref: ${{ github.event.workflow_run.head_sha || github.ref }}
@@ -131,14 +131,31 @@ jobs:
131131
if: steps.should_build.outputs.should_build == 'true'
132132
run: |
133133
echo "Building unilabos-env (conda environment dependencies)..."
134-
rattler-build build -r .conda/env/recipe.yaml -c uni-lab -c robostack-staging -c conda-forge
134+
rattler-build build -r .conda/environment/recipe.yaml -c uni-lab -c robostack-staging -c conda-forge
135+
136+
- name: Upload unilabos-env to Anaconda.org (if enabled)
137+
if: steps.should_build.outputs.should_build == 'true' && github.event.inputs.upload_to_anaconda == 'true'
138+
run: |
139+
echo "Uploading unilabos-env to uni-lab organization..."
140+
for package in $(find ./output -name "unilabos-env*.conda"); do
141+
anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
142+
done
135143
136144
- name: Build unilabos (with pip package)
137145
if: steps.should_build.outputs.should_build == 'true'
138146
run: |
139147
echo "Building unilabos package..."
148+
# 如果已上传到 Anaconda，从 uni-lab channel 获取 unilabos-env；否则从本地 output 获取
140149
rattler-build build -r .conda/base/recipe.yaml -c uni-lab -c robostack-staging -c conda-forge --channel ./output
141150
151+
- name: Upload unilabos to Anaconda.org (if enabled)
152+
if: steps.should_build.outputs.should_build == 'true' && github.event.inputs.upload_to_anaconda == 'true'
153+
run: |
154+
echo "Uploading unilabos to uni-lab organization..."
155+
for package in $(find ./output -name "unilabos-0*.conda" -o -name "unilabos-[0-9]*.conda"); do
156+
anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
157+
done
158+
142159
- name: Build unilabos-full - Only when explicitly requested
143160
if: |
144161
steps.should_build.outputs.should_build == 'true' &&
@@ -147,6 +164,17 @@ jobs:
147164
echo "Building unilabos-full package on ${{ matrix.platform }}..."
148165
rattler-build build -r .conda/full/recipe.yaml -c uni-lab -c robostack-staging -c conda-forge --channel ./output
149166
167+
- name: Upload unilabos-full to Anaconda.org (if enabled)
168+
if: |
169+
steps.should_build.outputs.should_build == 'true' &&
170+
github.event.inputs.build_full == 'true' &&
171+
github.event.inputs.upload_to_anaconda == 'true'
172+
run: |
173+
echo "Uploading unilabos-full to uni-lab organization..."
174+
for package in $(find ./output -name "unilabos-full*.conda"); do
175+
anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
176+
done
177+
150178
- name: List built packages
151179
if: steps.should_build.outputs.should_build == 'true'
152180
run: |
@@ -167,17 +195,9 @@ jobs:
167195
168196
- name: Upload conda package artifacts
169197
if: steps.should_build.outputs.should_build == 'true'
170-
uses: actions/upload-artifact@v4
198+
uses: actions/upload-artifact@v6
171199
with:
172200
name: conda-package-unilabos-${{ matrix.platform }}
173201
path: conda-packages-temp
174202
if-no-files-found: warn
175203
retention-days: 30
176-
177-
- name: Upload to Anaconda.org (uni-lab organization)
178-
if: github.event.inputs.upload_to_anaconda == 'true'
179-
run: |
180-
for package in $(find ./output -name "*.conda"); do
181-
echo "Uploading $package to uni-lab organization..."
182-
anaconda -t ${{ secrets.ANACONDA_API_TOKEN }} upload --user uni-lab --force "$package"
183-
done

‎unilabos/devices/Qone_nmr/__init__.py‎

Whitespace-only changes.

‎unilabos/devices/neware_battery_test_system/__init__.py‎

Whitespace-only changes.

0 commit comments

Comments
 (0)