deepmodeling
diff --git a/‎.conda/recipe.yaml‎
Lines changed: 69 additions & 0 deletions b/‎.conda/recipe.yaml‎
Lines changed: 69 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 9 additions & 1 deletion b/‎.gitignore‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎MANIFEST.in‎
Lines changed: 2 additions & 2 deletions b/‎MANIFEST.in‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎README.md‎
Lines changed: 1 addition & 11 deletions b/‎README.md‎
Lines changed: 1 addition & 11 deletions
diff --git a/‎README_zh.md‎
Lines changed: 1 addition & 11 deletions b/‎README_zh.md‎
Lines changed: 1 addition & 11 deletions
diff --git a/‎recipes/conda_build_config.yaml‎
Lines changed: 3 additions & 0 deletions b/‎recipes/conda_build_config.yaml‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎recipes/ros-humble-unilabos-msgs/recipe.yaml‎
Lines changed: 41 additions & 27 deletions b/‎recipes/ros-humble-unilabos-msgs/recipe.yaml‎
Lines changed: 41 additions & 27 deletions
diff --git a/‎recipes/unilabos/recipe.yaml‎
Lines changed: 1 addition & 1 deletion b/‎recipes/unilabos/recipe.yaml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎setup.py‎
Lines changed: 1 addition & 1 deletion b/‎setup.py‎
Lines changed: 1 addition & 1 deletion
@@ -0,0 +1,69 @@
+package:
+  name: unilabos
+  version: 0.10.1
+
+build:
+  noarch: python
+  number: 0
+  script:
+    - python -m pip install paho-mqtt opentrons_shared_data
+    - python -m pip install  git+https://github.com/Xuwznln/pylabrobot.git
+
+requirements:
+  host:
+    - python >=3.11
+    - pip
+    - setuptools
+  run:
+    - conda-forge::python =3.11.11
+    - compilers
+    - cmake
+    - make
+    - ninja
+    - sphinx
+    - sphinx_rtd_theme
+    - numpy
+    - scipy
+    - pandas
+    - networkx
+    - matplotlib
+    - pint
+    - pyserial
+    - pyusb
+    - pylibftdi
+    - pymodbus
+    - python-can
+    - pyvisa
+    - opencv
+    - pydantic
+    - fastapi
+    - uvicorn
+    - gradio
+    - flask
+    - websocket
+    - ipython
+    - jupyter
+    - jupyros
+    - colcon-common-extensions
+    - robostack-staging::ros-humble-desktop-full
+    - robostack-staging::ros-humble-control-msgs
+    - robostack-staging::ros-humble-sensor-msgs
+    - robostack-staging::ros-humble-trajectory-msgs
+    - ros-humble-navigation2
+    - ros-humble-ros2-control
+    - ros-humble-robot-state-publisher
+    - ros-humble-joint-state-publisher
+    - ros-humble-rosbridge-server
+    - ros-humble-cv-bridge
+    - ros-humble-tf2
+    - ros-humble-moveit
+    - ros-humble-moveit-servo
+    - ros-humble-simulation
+    - ros-humble-tf-transformations
+    - transforms3d
+    - uni-lab::ros-humble-unilabos-msgs
+
+about:
+  repository: https://github.com/dptech-corp/Uni-Lab-OS
+  license: GPL-3.0
+  description: "Uni-Lab-OS"
@@ -1,3 +1,7 @@
+configs/
+temp/
+output/
+unilabos_data/
 ## Python
 
 # Byte-compiled / optimized / DLL files
@@ -237,4 +241,8 @@ unilabos/device_mesh/view_robot.rviz
 
 
 # Certs
-**/.certs
+**/.certs
+local_test2.py
+ros-humble-unilabos-msgs-0.9.13-h6403a04_5.tar.bz2
+*.bz2
+test_config.py
@@ -1,5 +1,5 @@
 recursive-include unilabos/registry *.yaml
-recursive-include unilabos/app/web *.html
-recursive-include unilabos/app/web *.css
+recursive-include unilabos/app/static *
+recursive-include unilabos/app/templates *
 recursive-include unilabos/device_mesh/devices *
 recursive-include unilabos/device_mesh/resources *
@@ -40,21 +40,11 @@ Uni-Lab-OS recommends using `mamba` for environment management. Choose the appro
 
 ```bash
 # Create new environment
-mamba env create -f unilabos-[YOUR_OS].yaml
-mamba activate unilab
+mamba create -n unilab unilab -c unilab -c robostack -c robostack-staging -c conda-forge
 
 # Or update existing environment
 # Where `[YOUR_OS]` can be `win64`, `linux-64`, `osx-64`, or `osx-arm64`.
 conda env update --file unilabos-[YOUR_OS].yml -n environment_name
-
-# Currently, you need to install the `unilabos_msgs` package
-# You can download the system-specific package from the Release page
-conda install ros-humble-unilabos-msgs-0.9.7-xxxxx.tar.bz2
-
-# Install PyLabRobot and other prerequisites
-git clone https://github.com/PyLabRobot/pylabrobot plr_repo
-cd plr_repo
-pip install .[opentrons]
 ```
 
 2. Install Uni-Lab-OS:
 
@@ -40,21 +40,11 @@ Uni-Lab-OS 建议使用 `mamba` 管理环境。根据您的操作系统选择适
 
 ```bash
 # 创建新环境
-mamba env create -f unilabos-[YOUR_OS].yaml
-mamba activate unilab
+mamba create -n unilab unilab -c unilab -c robostack -c robostack-staging -c conda-forge
 
 # 或更新现有环境
 # 其中 `[YOUR_OS]` 可以是 `win64`, `linux-64`, `osx-64`, 或 `osx-arm64`。
 conda env update --file unilabos-[YOUR_OS].yml -n 环境名
-
-# 现阶段，需要安装 `unilabos_msgs` 包
-# 可以前往 Release 页面下载系统对应的包进行安装
-conda install ros-humble-unilabos-msgs-0.9.7-xxxxx.tar.bz2
-
-# 安装PyLabRobot等前置
-git clone https://github.com/PyLabRobot/pylabrobot plr_repo
-cd plr_repo
-pip install .[opentrons]
 ```
 
 2. 安装 Uni-Lab-OS:
 
@@ -1,3 +1,6 @@
+channel_sources:
+  - robostack,robostack-staging,conda-forge,defaults
+  
 gazebo:
   - '11'
 libpqxx:
 
@@ -1,46 +1,58 @@
 package:
   name: ros-humble-unilabos-msgs
-  version: 0.9.7
+  version: 0.10.1
+
 source:
   path: ../../unilabos_msgs
-  folder: ros-humble-unilabos-msgs/src/work
+  target_directory: ros-humble-unilabos-msgs/src/work
 
 build:
   script:
-    sel(win): bld_ament_cmake.bat
-    sel(unix): build_ament_cmake.sh
+    - if: win
+      then:
+        - call %RECIPE_DIR%/bld_ament_cmake.bat
+    - if: unix
+      then:
+        - bash $RECIPE_DIR/build_ament_cmake.sh
   number: 5
 about:
-  home: https://www.ros.org/
+  repository: https://github.com/dptech-corp/Uni-Lab-OS
   license: BSD-3-Clause
-  summary: |
-    Robot Operating System
-
-extra:
-  recipe-maintainers:
-    - ros-forge
+  description: "ros-humble-unilabos-msgs is a package that provides message definitions for Uni-Lab-OS."
 
 requirements:
   build:
-    - "{{ compiler('cxx') }}"
-    - "{{ compiler('c') }}"
-    - sel(linux64): sysroot_linux-64 2.17
+    - ${{ compiler('cxx') }}
+    - ${{ compiler('c') }}
+    - if: linux and x86_64
+      then:
+        - sysroot_linux-64 2.17
     - ninja
     - setuptools
-    - sel(unix): make
-    - sel(unix): coreutils
-    - sel(osx): tapi
-    - sel(build_platform != target_platform): pkg-config
-    - cmake
     - cython
-    - sel(win): vs2022_win-64
-    - sel(build_platform != target_platform): python
-    - sel(build_platform != target_platform): cross-python_{{ target_platform }}
-    - sel(build_platform != target_platform): numpy
+    - cmake
+    - if: unix
+      then:
+        - make
+        - coreutils
+    - if: osx
+      then:
+        - tapi
+    - if: win
+      then:
+        - vs2022_win-64
+    - if: build_platform != target_platform
+      then:
+        - pkg-config
+        - python
+        - cross-python_${{ target_platform }}
+        - numpy
   host:
     - numpy
     - pip
-    - sel(build_platform == target_platform): pkg-config
+    - if: build_platform == target_platform
+      then:
+        - pkg-config
     - robostack-staging::ros-humble-action-msgs
     - robostack-staging::ros-humble-ament-cmake
     - robostack-staging::ros-humble-ament-lint-auto
@@ -50,12 +62,14 @@ requirements:
     - robostack-staging::ros-humble-rosidl-default-generators
     - robostack-staging::ros-humble-std-msgs
     - robostack-staging::ros-humble-geometry-msgs
-    - robostack-staging::ros2-distro-mutex=0.5.*
+    - robostack-staging::ros2-distro-mutex=0.6
   run:
     - robostack-staging::ros-humble-action-msgs
     - robostack-staging::ros-humble-ros-workspace
     - robostack-staging::ros-humble-rosidl-default-runtime
     - robostack-staging::ros-humble-std-msgs
     - robostack-staging::ros-humble-geometry-msgs
-#    - robostack-staging::ros2-distro-mutex=0.6.*
-    - sel(osx and x86_64): __osx >={{ MACOSX_DEPLOYMENT_TARGET|default('10.14') }}
+    - robostack-staging::ros2-distro-mutex=0.6
+    - if: osx and x86_64
+      then:
+        - __osx >= {{ MACOSX_DEPLOYMENT_TARGET|default('10.14') }}
@@ -1,6 +1,6 @@
 package:
   name: unilabos
-  version: "0.9.7"
+  version: "0.10.1"
 
 source:
   path: ../..
 
@@ -4,7 +4,7 @@
 
 setup(
     name=package_name,
-    version='0.9.7',
+    version='0.10.1',
     packages=find_packages(),
     include_package_data=True,
     install_requires=['setuptools'],