Conda build recipe updates for first attempt at PyBERT v4.1.0.

jdpatt · Mar 9, 2023 · a4f93fa · a4f93fa
1 parent 822a578
commit a4f93fa
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 27 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "PyAMI"]
 	path = PyAMI
 	url = https://github.com/capn-freako/PyAMI.git
-[submodule "enable"]
-	path = enable
-	url = https://github.com/enthought/enable.git
 [submodule "chaco"]
 	path = chaco
 	url = https://github.com/enthought/chaco.git

diff --git a/conda.recipe/enable/meta.yaml b/conda.recipe/enable/meta.yaml
@@ -10,7 +10,7 @@ source:
   git_rev: {{version}}
 
 build:
-  number: 1
+  number: 2
   script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "
 
 requirements:

diff --git a/conda.recipe/pybert/meta.yaml b/conda.recipe/pybert/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "pybert" %}
-{% set version = "4.0.5" %}
+{% set version = "4.1.0" %}
 
 package:
   version: '{{ version }}'
@@ -20,19 +20,21 @@ requirements:
     - kiwisolver
     - numpy x.x
     - pyibis-ami >=4.0.5
-    - pyside6
+    # - pyside6  # Not available in Anaconda, yet.
+    - pyside2
     - python x.x
     - pyyaml
-    # - qt >=5
+    - qt >=5
     - scikit-rf >=0.24.1
   build:
     - kiwisolver
     - numpy x.x
     - pyibis-ami >=4.0.5
-    - pyside6
+    # - pyside6  # Not available in Anaconda, yet.
+    - pyside2
     - python x.x
     - pyyaml
-    # - qt >=5
+    - qt >=5
     - scikit-rf >=0.24.1
     - setuptools
 

diff --git a/conda.recipe/pyibis-ami/meta.yaml b/conda.recipe/pyibis-ami/meta.yaml
@@ -1,12 +1,14 @@
 {% set name = "pyibis-ami" %}
-{% set version = "4.0.5" %}
+{% set version = "4.0.6" %}
 
 package:
   version: '{{ version }}'
   name: '{{ name|lower }}'
 
 source:
-  path: ../../PyAMI/
+  # path: ../../PyAMI
+  # git_url: ../../PyAMI
+  git_url: ../../PyAMI_pruned
   # git_url: https://github.com/capn-freako/PyAMI.git
   # git_rev: {{ version }}
   # git_depth: 1 # (Defaults to -1/not shallow)
@@ -18,26 +20,35 @@ build:
   script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "
 
 requirements:
-  run:
+  build:
+  # host:
     - chaco  >=5.1.0
     - click
+    - cmake
+    - Cython
     - empy
+    - git
+    - importlib_resources
     - matplotlib
-    - numpy x.x
+    - numpy 1.23.*
     - parsec >=3.13
     - python
     - scipy
+    - setuptools
+    - swig
+    - vs2019_win-64        # Uncomment for Windows build only.
+    # - {{ compiler('c') }}    # Would like to get one of these working, instead of above hack.
+    # - {{ compiler('cxx') }}
 
-  build:
+  run:
     - chaco  >=5.1.0
     - click
     - empy
     - matplotlib
-    - numpy x.x
+    - numpy 1.23.*
     - parsec >=3.13
     - python
     - scipy
-    - setuptools
 
 test:
   imports:

diff --git a/enable b/enable
diff --git a/src/pybert/__init__.py b/src/pybert/__init__.py
@@ -14,3 +14,14 @@
 __date__ = "February 13, 2023"
 __authors__ = "David Banas & David Patterson"
 __copy__ = "Copyright (c) 2014 David Banas, 2019 David Patterson"
+
+# fmt: off
+# isort: off
+from traits.etsconfig.api import ETSConfig
+ETSConfig.toolkit = 'qt4'  # Yields unacceptably small font sizes in plot axis labels.
+# ETSConfig.toolkit = 'qt4.celiagg'   # Yields unacceptably small font sizes in plot axis labels.
+# ETSConfig.toolkit = 'qt.qpainter'  # Was causing crash on Mac.
+# ETSConfig.toolkit = 'qt.image'     # Program runs, but very small fonts in plot titles and axis labels.
+# ETSConfig.toolkit = 'wx'           # Crashes on launch.
+# fmt: on
+# isort: on
diff --git a/src/pybert/pybert.py b/src/pybert/pybert.py
@@ -13,16 +13,6 @@
 
 Copyright (c) 2014 by David Banas; All rights reserved World wide.
 """
-# fmt: off
-# isort: off
-from traits.etsconfig.api import ETSConfig
-# ETSConfig.toolkit = 'qt4'  # Yields unacceptably small font sizes in plot axis labels.
-# ETSConfig.toolkit = 'qt4.celiagg'   # Yields unacceptably small font sizes in plot axis labels.
-# ETSConfig.toolkit = 'qt.qpainter'  # Was causing crash on Mac.
-# ETSConfig.toolkit = 'qt.image'     # Program runs, but very small fonts in plot titles and axis labels.
-# ETSConfig.toolkit = 'wx'           # Crashes on launch.
-# fmt: on
-# isort: on
 import platform
 import time
 from datetime import datetime
@@ -1751,6 +1741,7 @@ def clear_reference_from_plots(self):
 
     def log_information(self):
         """Log the system information."""
+        from traits.etsconfig.api import ETSConfig
         self.log(f"System: {platform.system()} {platform.release()}")
         self.log(f"Python Version: {platform.python_version()}")
         self.log(f"PyBERT Version: {VERSION}")