Merge pull request #277 from jakirkham-feedstocks/use_m2-git_win

conda-forge · May 22, 2024 · 757179f · 757179f
2 parents 53f0075 + 426547f
commit 757179f
Show file tree

Hide file tree

Showing 7 changed files with 192 additions and 7 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -0,0 +1,4 @@
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,6 +1,9 @@
 conda_forge_output_validation: true
+conda_build:
+  pkg_format: '2'
 github:
   branch_name: main
   tooling_branch_name: main
-conda_build:
-  pkg_format: '2'
+noarch_platforms:
+- linux_64
+- win_64
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -9,8 +9,10 @@ source:
   sha256: d6240b78efdb786212dda051d782a139911b2484b7a183378ce151822c073cb9
 
 build:
-  number: 0
+  number: 1
   noarch: python
+  string: unix_pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }}  # [unix]
+  string: win_pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }}   # [win]
   script:
     - {{ PYTHON }} -m pip install . --no-deps -vv
     - rm -f "${PREFIX}/bin/conda"           # [not win]
@@ -27,6 +29,8 @@ requirements:
     - setuptools-scm >=8.1
     - tomli >=1.0.0
   run:
+    - __unix                          # [unix]
+    - __win                           # [win]
     - python >=3.6
     - setuptools
     - conda >=4.2
@@ -36,7 +40,8 @@ requirements:
     - requests
     - pycryptodome
     - gitpython
-    - git
+    - git                             # [unix]
+    - m2-git                          # [win]
     - pygithub >=2,<3
     - ruamel.yaml >=0.16
     - conda-forge-pinning