Skip to content
Closed
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
2 changes: 2 additions & 0 deletions .ci_support/conda_forge_pinnings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -713,12 +713,14 @@ python:
- 3.9.* *_cpython
- 3.10.* *_cpython
- 3.11.* *_cpython
- 3.12.* *_cpython
python_impl:
# part of a zip_keys: python, python_impl, numpy
- cpython
- cpython
- cpython
- cpython
- cpython
pytorch:
- '2.0'
pyqt:
Expand Down
2 changes: 1 addition & 1 deletion .github/testpr_environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- robostack-staging
- conda-forge
dependencies:
- python 3.11.*
- python 3.12.*
- pip
- boa
- conda-build <3.28
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
- uses: actions/setup-python@v5
with:
python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
python-version: '3.12' # Version range or exact version of a Python version to use, using SemVer's version range syntax
- name: Install vinca
run: |
pip install git+https://github.com/RoboStack/vinca.git@rattler-build
Expand Down
2 changes: 1 addition & 1 deletion .scripts/build_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pwd
cd ${FEEDSTOCK_ROOT}

for recipe in ${CURRENT_RECIPES[@]}; do
pixi run rattler-build build \
pixi run -v rattler-build build \
--recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \
-m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \
-c robostack-jazzy -c conda-forge \
Expand Down
2 changes: 1 addition & 1 deletion .scripts/build_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ curl -fsSL https://pixi.sh/install.sh | bash
export PATH="$HOME/.pixi/bin:$PATH"

for recipe in ${CURRENT_RECIPES[@]}; do
pixi run rattler-build build \
pixi run -v rattler-build build \
--recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \
-m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \
-c robostack-jazzy -c conda-forge \
Expand Down
5 changes: 4 additions & 1 deletion .scripts/build_osx_arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ export "CONDA_BLD_PATH=$HOME/conda-bld/"
curl -fsSL https://pixi.sh/install.sh | bash
export PATH="$HOME/.pixi/bin:$PATH"

# Remove homebrew from $PATH
export PATH=$(echo $PATH | tr ":" "\n" | grep -v 'homebrew' | xargs | tr ' ' ':')

for recipe in ${CURRENT_RECIPES[@]}; do
pixi run rattler-build build \
pixi run -v rattler-build build \
--recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \
-m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \
-c robostack-jazzy -c conda-forge \
Expand Down
2 changes: 1 addition & 1 deletion .scripts/build_win.bat
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ reg add HKLM\SYSTEM\CurrentControlSet\Control\FileSystem /v LongPathsEnabled /t
for %%X in (%CURRENT_RECIPES%) do (
echo "BUILDING RECIPE %%X"
cd %FEEDSTOCK_ROOT%\recipes\%%X\
pixi run rattler-build build --recipe %FEEDSTOCK_ROOT%\recipes\%%X\ ^
pixi run -v rattler-build build --recipe %FEEDSTOCK_ROOT%\recipes\%%X\ ^
-m %FEEDSTOCK_ROOT%\conda_build_config.yaml ^
-c robostack-jazzy -c conda-forge ^
--output-dir %CONDA_BLD_PATH%
Expand Down
21 changes: 0 additions & 21 deletions additional_recipes/ros-humble-octomap/recipe.yaml

This file was deleted.

19 changes: 0 additions & 19 deletions additional_recipes/ros-humble-urdfdom-py/recipe.yaml

This file was deleted.

7 changes: 3 additions & 4 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@ c_stdlib_version:
- ${{ "10.14" if osx and x86_64 }}
- ${{ "11.0" if osx and arm64 }}


# # Project overrides
# macos_min_version: # [osx and x86_64]
# - 10.14 # [osx and x86_64]
# - 10.15 # [osx and x86_64]
# macos_machine: # [osx]
# - x86_64-apple-darwin13.4.0 # [osx and x86_64]
# - arm64-apple-darwin20.0.0 # [osx and arm64]
# MACOSX_DEPLOYMENT_TARGET: # [osx]
# - 11.0 # [osx and arm64]
# - 10.14 # [osx and x86_64]
# - 10.15 # [osx and x86_64]
# CONDA_BUILD_SYSROOT:
# - /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk # [osx and arm64]
# - /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk # [osx and arm64]
2 changes: 1 addition & 1 deletion env/robostackenv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- robostack-staging
- conda-forge
dependencies:
- python=3.11
- python=3.12
- anaconda-client
- catkin_pkg
- ruamel.yaml
Expand Down
Loading