adjusted meta.yaml files requirement sections to what I believe a cor…

…rect setup according to the doc-v2
i4Ds · Nov 30, 2023 · 74fd195 · 74fd195
1 parent d53d080
commit 74fd195
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 42 deletions.
diff --git a/aotools/meta.yaml b/aotools/meta.yaml
@@ -12,12 +12,12 @@ build:
 
 requirements:
   build: 
-    - python                {{ python }}
-    - pip
+    - python
     - numpy
 
   host:
     - python                {{ python }}
+    - pip
     - numpy
 
   run:

diff --git a/aratmospy/meta.yaml b/aratmospy/meta.yaml
@@ -13,12 +13,12 @@ build:
 
 requirements:
   build:
-    - python                  {{ python }}
-    - pip
+    - python
     - numpy
 
   host:
     - python                  {{ python }}
+    - pip
     - numpy
 
   run:

diff --git a/bipp/meta.yaml b/bipp/meta.yaml
@@ -15,13 +15,13 @@ requirements:
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
     - {{ compiler('gfortran') }}
-    - python           {{ python }}
+    - python
     - cmake
-    - scikit-build
 
   host:
     - python          {{ python }}
     - openblas
+    - scikit-build
     - finufft         =={{ FINUFFT_VERSION_ALT }}
 
   run:

diff --git a/eidos/meta.yaml b/eidos/meta.yaml
@@ -13,12 +13,12 @@ build:
 
 requirements:
   build:
-    - python                  {{ python }}
-    - pip
+    - python
     - numpy
 
   host:
     - python                  {{ python }}
+    - pip
     - numpy
 
   run:

diff --git a/finufft/meta.yaml b/finufft/meta.yaml
@@ -21,14 +21,15 @@ requirements:
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
     - {{ compiler('gfortran') }}
-    - python          {{ python }}
-    - pip
+    - python
     - make
     - cmake
     - numpy
+    - fftw
 
   host:
     - python          {{ python }}
+    - pip
     - numpy
     - fftw            =={{ FFTW3_VERSION_ALT }}
 

diff --git a/hvox/meta.yaml b/hvox/meta.yaml
@@ -13,14 +13,14 @@ build:
 
 requirements:
   build:
-    - python                {{ python }}
-    - pip
+    - python
     - numpy
-    - setuptools            >=61.0
 
   host:
     - python                {{ python }}
+    - pip
     - numpy
+    - setuptools            >=61.0
 
   run:
     - python                {{ python }}

diff --git a/katbeam/meta.yaml b/katbeam/meta.yaml
@@ -13,12 +13,12 @@ build:
 
 requirements:
   build:
-    - python            {{ python }}
-    - pip
+    - python
     - numpy
 
   host:
     - python            {{ python }}
+    - pip
     - numpy
 
   run:

diff --git a/montagepy/meta.yaml b/montagepy/meta.yaml
@@ -12,13 +12,13 @@ build:
 
 requirements:
   build:
-    - python {{ python }}
     - {{ compiler('c') }}
-    - pip
+    - python
     - numpy
 
   host:
     - python {{ python }}
+    - pip
     - numpy
 
   run:

diff --git a/oskar-py/meta.yaml b/oskar-py/meta.yaml
@@ -12,12 +12,12 @@ build:
 
 requirements:
   build:
-    - python      {{ python }}
-    - pip
+    - python
     - numpy
 
   host:
     - python      {{ python }}
+    - pip
     - numpy
     - oskar       =={{ OSKARPY_VERSION_ALT }}
 

diff --git a/pybdsf/meta.yaml b/pybdsf/meta.yaml
@@ -14,19 +14,20 @@ requirements:
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
     - {{ compiler('gfortran') }}
+    - python
     - cmake         >=3.18
     - numpy
-    - pip
-    - python        {{ python }}
-    - setuptools    <=65.6
     - ninja
-    - scikit-build  >=0.13
-    - wheel
 
   host:
     - python        {{ python }}
     - numpy
+    - pip
+    - setuptools    <=65.6
     - boost         >={{ BOOST_VERSION_ALT }}.*
+    - ninja
+    - scikit-build  >=0.13
+    - wheel
 
   run:
     - python        {{ python }}

diff --git a/pycsou/meta.yaml b/pycsou/meta.yaml
@@ -13,13 +13,13 @@ build:
 
 requirements:
   build:
-    - python      {{ python }}
-    - pip
+    - python
     - numpy
 
   host:
     - python      {{ python }}
     - numpy
+    - pip
 
   run:
     - python      {{ python }}

diff --git a/rascil/meta.yaml b/rascil/meta.yaml
@@ -13,17 +13,17 @@ build:
 
 requirements:
   build:
-    - python                {{ python }}
+    - python
     - curl
-    - pip
     - git-lfs
     - git
     - numpy
-    - setuptools
 
   host:
     - python                {{ python }}
+    - pip
     - numpy
+    - setuptools
 
   run:
     - python                {{ python }}

diff --git a/seqfile/meta.yaml b/seqfile/meta.yaml
@@ -14,11 +14,11 @@ build:
 
 requirements:
   build:
-    - python        {{ python }}
-    - pip
+    - python
 
   host:
     - python        {{ python }}
+    - pip
 
   run:
     - python        {{ python }}

diff --git a/ska-gridder-nifty-cuda/meta.yaml b/ska-gridder-nifty-cuda/meta.yaml
@@ -15,14 +15,14 @@ build:
 requirements:
   build: 
     - {{ compiler('cxx') }}
-    - python    {{ python }}
+    - python
     - git
-    - pip
     - numpy
 
   host:
     - python    {{ python }}
     - numpy
+    - pip
 
   run:
     - python    {{ python }}

diff --git a/ska-sdp-datamodels/meta.yaml b/ska-sdp-datamodels/meta.yaml
@@ -16,14 +16,14 @@ build:
 
 requirements:
   build:
-    - python            {{ python }}
-    - pip
-    - poetry-core       >=1.0.0
+    - python
     - numpy
 
   host:
     - python            {{ python }}
+    - pip
     - numpy
+    - poetry-core       >=1.0.0
 
   run:
     - python            {{ python }}

diff --git a/ska-sdp-func-python/meta.yaml b/ska-sdp-func-python/meta.yaml
@@ -16,12 +16,12 @@ build:
 
 requirements:
   build:
-    - python                {{ python }}
-    - poetry-core           >=1.0.0
+    - python
     - numpy
 
   host:
     - python                {{ python }}
+    - poetry-core           >=1.0.0
     - numpy
 
   run:

diff --git a/ska-sdp-func/meta.yaml b/ska-sdp-func/meta.yaml
@@ -15,12 +15,12 @@ requirements:
     - libgcc-ng=11.3 # will fail with compiler version above
     - cmake
     - make
-    - python  {{ python }}
-    - pip
+    - python
     - numpy
 
   host:
     - python  {{ python }}
+    - pip
     - numpy
 
   run:

diff --git a/tools21cm/meta.yaml b/tools21cm/meta.yaml
@@ -13,13 +13,13 @@ build:
 
 requirements:
   build:
-    - python       {{ python }}
-    - setuptools
+    - python
     - numpy
 
   host:
     - python           {{ python }}
     - numpy
+    - setuptools
 
   run:
     - python       {{ python }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,12 +12,12 @@ build: @@
     requirements:
       build:
-        - python                {{ python }}
-        - pip
+        - python
         - numpy
       host:
         - python                {{ python }}
+        - pip
         - numpy
       run:
@@ Expand Down @@