feat: Implemented single source versioning of dependencies. (#126)

* Implemented single source versioning of dependencies. * [pre-commit.ci] auto fixes from pre-commit.com hooks * Bumped PyAMI submodule commit. Fixes #125
capn-freako · Apr 21, 2023 · 1559923 · 1559923
1 parent d50d944
commit 1559923
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 66 deletions.
diff --git a/PyAMI b/PyAMI
diff --git a/conda.recipe/chaco/meta.yaml b/conda.recipe/chaco/meta.yaml
@@ -9,30 +9,42 @@ package:
 source:
   git_url: https://github.com/enthought/chaco.git
   git_rev: {{ version }}
+
 build:
-  number: 1
+  number: 3
   script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "
+  script_env:
+    - ETS_QT4_IMPORTS=1
 
 requirements:
   build:
+    - {{ compiler('c')   }}
+    - {{ compiler('cxx') }}
+    - {{ cdt('libx11-devel') }}          # [linux]
+    - {{ cdt('xorg-x11-proto-devel') }}  # [linux]
+    - {{ cdt('mesa-libgl-devel') }}      # [linux]
+    - {{ cdt('mesa-libglu-devel') }}     # [linux]
+    - {{ cdt('mesa-dri-drivers') }}      # [linux]
+    - {{ cdt('mesa-dri1-drivers') }}     # [linux]
+    - {{ cdt('libselinux') }}            # [linux]
+    - {{ cdt('libxdamage') }}            # [linux]
+    - {{ cdt('libxxf86vm') }}            # [linux]
+    - {{ cdt('libxext') }}               # [linux]
     - cmake
+    - git
+    - swig
+  host:
     - Cython
     - enable ={{ enable_version }}
-    - git
     - importlib_resources
-    - numpy x.x
+    - numpy {{ numpy }}
     - pyface >=7.4.2
-    - python
+    - python {{ python }}
     - setuptools
-    # - vs2019_win-64        # Uncomment for Windows build only.
-    # - {{compiler('c')}}    # Would like to get one of these working, instead of above hack.
-    # - {{compiler('cxx')}}
-
   run:
-    - Cython
     - enable ={{ enable_version }}
     - importlib_resources
-    - numpy x.x
+    - {{ pin_compatible('numpy') }}
     - pyface >=7.4.2
     - python
 
@@ -41,19 +53,6 @@ test:
   imports:
     - chaco
     - chaco.api
-    # - chaco.contour
-    # - chaco.downsample
-    # - chaco.downsample.tests
-    # - chaco.layers
-    # - chaco.overlays
-    # - chaco.plugin
-    # - chaco.scales
-    # - chaco.scales.tests
-    # - chaco.shell
-    # - chaco.tests
-    # - chaco.tools
-    # - chaco.tools.tests
-    # - chaco.tools.toolbars
     - chaco.ui
 
   # commands:

diff --git a/conda.recipe/enable/meta.yaml b/conda.recipe/enable/meta.yaml
@@ -10,7 +10,7 @@ source:
   git_rev: {{version}}
 
 build:
-  number: 3
+  number: 5
   script: " {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "
   script_env:
     - CFLAGS=-Wno-c++11-narrowing
@@ -41,17 +41,19 @@ requirements:
     - pyface >=7.4.2
     - pyparsing
     - python {{ python }}
+    - qt >=5
     - setuptools
     - six
     - traitsui
     - xorg-libxfixes                     # [linux]
   run:
     - fonttools
-    - numpy {{ numpy }}
+    - {{ pin_compatible('numpy') }}
     - pillow >=9.4
     - pyface >=7.4.2
     - pyparsing
-    - python {{ python }}
+    - python
+    - qt >=5
     - six
     - traitsui
 
@@ -63,7 +65,6 @@ test:
     - enable.layout
     - enable.null
     - enable.primitives
-    # - enable.pyglet_backend
     - enable.qt4
     - enable.savage
     - enable.savage.compliance
@@ -83,7 +84,6 @@ test:
     - enable.tests.primitives
     - enable.tests.qt4
     - enable.tests.tools
-    # - enable.tests.tools.apptools
     - enable.tests.wx
     - enable.tools
     - enable.tools.apptools
@@ -93,7 +93,6 @@ test:
     - enable.trait_defs.ui
     - enable.trait_defs.ui.qt4
     - enable.trait_defs.ui.wx
-    # - enable.vtk_backend
     - enable.wx
     - kiva
     - kiva.agg

diff --git a/conda.recipe/pybert/meta.yaml b/conda.recipe/pybert/meta.yaml
@@ -1,6 +1,7 @@
 {% set name = "pybert" %}
-{% set pyproject = load_file_data('../../pyproject.toml', from_recipe_dir=true, recipe_dir="conda.recipe/pybert") %}
+{% set pyproject = load_file_data('../../pyproject.toml', from_recipe_dir=true, recipe_dir="conda.recipe/{{ name }}") %}
 {% set version = pyproject.get('project', {}).get('version') %}
+{% set deps = pyproject.get('project', {}).get('dependencies', []) %}
 
 package:
   version: '{{ version }}'
@@ -10,7 +11,7 @@ source:
   path: ../../
 
 build:
-  number: 1
+  number: 3
   script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "
   entry_points:
     - pybert = pybert.cli:cli
@@ -23,26 +24,18 @@ requirements:
     - git
     - swig
   host:
-    - kiwisolver
     - numpy {{ numpy }}
-    - pyibis-ami >=4.1
-    # - pyside6  # Not available in Anaconda, yet.
-    - pyside2
     - python {{ python }}
-    - pyyaml
-    - qt >=5
-    - scikit-rf >=0.24.1
     - setuptools
+    {% for dep in deps %}
+    - {{ dep }}
+    {% endfor %}
   run:
-    - kiwisolver
-    - numpy {{ numpy }}
-    - pyibis-ami >=4.1
-    # - pyside6  # Not available in Anaconda, yet.
-    - pyside2
-    - python {{ python }}
-    - pyyaml
-    - qt >=5
-    - scikit-rf >=0.24.1
+    - {{ pin_compatible('numpy') }}
+    - python
+    {% for dep in deps %}
+    - {{ dep }}
+    {% endfor %}
 
 test:
   imports:

diff --git a/conda.recipe/pyibis-ami/meta.yaml b/conda.recipe/pyibis-ami/meta.yaml
@@ -1,6 +1,8 @@
 {% set name = "pyibis-ami" %}
-{% set pyproject = load_file_data('../../PyAMI/pyproject.toml', from_recipe_dir=true, recipe_dir="conda.recipe/pyibis-ami") %}
+{% set pyproject = load_file_data('../../PyAMI/pyproject.toml', from_recipe_dir=true, recipe_dir="conda.recipe/{{ name }}") %}
 {% set version = pyproject.get('project', {}).get('version') %}
+{% set deps = pyproject.get('project', {}).get('dependencies', []) %}
+{% set build_reqs = pyproject.get('build-system', {}).get('requires', []) %}
 
 package:
   version: '{{ version }}'
@@ -15,7 +17,7 @@ source:
   # git_depth: 1 # (Defaults to -1/not shallow)
 
 build:
-  number: 0
+  number: 2
   script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "
 
 requirements:
@@ -25,28 +27,23 @@ requirements:
     - cmake
     - git
     - swig
+    {% for req in build_reqs %}
+    - {{ req }}
+    {% endfor %}
   host:
-    - chaco  >=5.1.1
-    - click >=8.1.3
     - Cython
-    - empy >=3.3.4
-    - importlib_resources
-    - matplotlib >=3.6.1
     - numpy {{ numpy }}
-    - parsec >=3.15
     - python {{ python }}
-    - scipy >=1.9
     - setuptools
-
+    {% for dep in deps %}
+    - {{ dep }}
+    {% endfor %}
   run:
-    - chaco  >=5.1.1
-    - click >=8.1.3
-    - empy >=3.3.4
-    - matplotlib >=3.6.1
-    - numpy {{ numpy }}
-    - parsec >=3.15
-    - python {{ python }}
-    - scipy >=1.9
+    - {{ pin_compatible('numpy') }}
+    - python
+    {% for dep in deps %}
+    - {{ dep }}
+    {% endfor %}
 
 test:
   imports:

diff --git a/pyproject.toml b/pyproject.toml
@@ -14,6 +14,7 @@ readme = "README.md"
 requires-python = ">=3.8"
 license = {text = "BSD"}
 dependencies = [
+        "kiwisolver",
         "PyIBIS-AMI>=4.1",
         "pyside2",
         "pyyaml>=6",