Merge pull request #148 from regro-cf-autotick-bot/6.4.2_hd3a289

[bot-automerge] zaber-motion v6.4.2
conda-forge · Aug 9, 2024 · e96bbb7 · e96bbb7
2 parents 39131f8 + c33cfd4
commit e96bbb7
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 53 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -19,7 +19,7 @@ channel_sources:
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-aarch64
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 target_platform:
 - linux-aarch64
 zip_keys:

diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -15,7 +15,7 @@ channel_sources:
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-ppc64le
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 target_platform:
 - linux-ppc64le
 zip_keys:

diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,17 +1,15 @@
 bot:
   automerge: true
 build_platform:
-  linux_aarch64: linux_aarch64
-  linux_ppc64le: linux_ppc64le
+  linux_aarch64: linux_64
+  linux_ppc64le: linux_64
   osx_arm64: osx_64
 conda_build:
   pkg_format: '2'
 conda_forge_output_validation: true
 github:
   branch_name: main
   tooling_branch_name: main
-os_version:
-  linux_64: cos7
 provider:
   linux_aarch64: default
   linux_ppc64le: default

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "6.4.0" %}
+{% set version = "6.4.2" %}
 {% set zaber_bson_commit = "db11c31b2c1b69151648bb82150144f0b2003f29" %}
 
 package:
@@ -7,7 +7,7 @@ package:
 
 source:
   - url: https://gitlab.com/zaber-core-libs/zaber-motion-lib/-/archive/v{{ version }}/zaber-motion-lib-v{{ version }}.tar.gz
-    sha256: f622530d7bc6458a9c971298c207fd0e4f6eb154c15a5fa9470d389c3bcd9296
+    sha256: 8abce94a46c3cae455921577558ac9d03926fc504d6ad7f02bb180015f33a9a9
     folder: src/zaber-motion
     patches:
       - no_bindings_install.patch
@@ -26,7 +26,7 @@ outputs:
     script: bld_lib.bat  # [win]
     build:
       run_exports:
-        - {{ pin_subpackage('libzaber-motion', 'x.x') }}
+        - {{ pin_subpackage('libzaber-motion', max_pin='x.x') }}
 
     requirements:
       build:
@@ -47,10 +47,11 @@ outputs:
     script: bld_python.bat  # [win]
     build:
       noarch: python
+      skip: true   # [not linux64]
 
     requirements:
       build:
-        - python                                 # [build_platform != target_platform]
+        - python >=3.8                           # [build_platform != target_platform]
         - cross-python_{{ target_platform }}     # [build_platform != target_platform]
       host:
         - python >=3.8
@@ -62,7 +63,7 @@ outputs:
         # https://gitlab.com/ZaberTech/zaber-motion-lib/-/blob/master/py/pyproject.toml?ref_type=heads#L13
         # But lets loosen thing just a tiny bit
         - reactivex 4.0.*
-        - {{ pin_subpackage('libzaber-motion', exact=True) }}
+        - {{ pin_subpackage('libzaber-motion', max_pin='x.x.x') }}
 
     test:
       requires: