Skip to content

Commit

Permalink
141 update chacoenable to 600 for next release (#142)
Browse files Browse the repository at this point in the history
* First successful build of the new Enable (6.0.0).

- Changed Conda channel order, to give conda-forge precedence over defaults.

* Successful Enable/Chaco builds for NumPy 1.25 and Python 3.9, 10, and 11.

* PyIBIS-AMI v5.1.0rc1 build.

* PyBERT v5.1.0rc1 build.
  • Loading branch information
capn-freako authored Dec 20, 2023
1 parent 0a486ac commit b02f447
Show file tree
Hide file tree
Showing 10 changed files with 74 additions and 46 deletions.
18 changes: 10 additions & 8 deletions conda.recipe/chaco/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "chaco" %}
{% set version = "5.1.1" %}
{% set enable_version = "5.3.1" %}
{% set version = "6.0.0" %}
{% set enable_version = "6.0.0" %}

package:
name: "{{ name|lower }}"
Expand All @@ -11,10 +11,10 @@ source:
git_rev: {{ version }}

build:
number: 3
number: 1
script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "
script_env:
- ETS_QT4_IMPORTS=1
# script_env:
# - ETS_QT4_IMPORTS=1

requirements:
build:
Expand All @@ -31,21 +31,23 @@ requirements:
- {{ cdt('libxxf86vm') }} # [linux]
- {{ cdt('libxext') }} # [linux]
- cmake
- Cython <3
- git
- pip <23
- python {{ python }}
- swig
host:
- Cython
- Cython <3
- enable ={{ enable_version }}
- importlib_resources
- numpy {{ numpy }}
- pyface >=7.4.2
- pip <23
- python {{ python }}
- setuptools
run:
- enable ={{ enable_version }}
- importlib_resources
- {{ pin_compatible('numpy') }}
- pyface >=7.4.2
- python

test:
Expand Down
39 changes: 20 additions & 19 deletions conda.recipe/enable/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "enable" %}
{% set version = "5.3.1" %}
{% set version = "6.0.0" %}

package:
name: "{{ name|lower }}"
Expand All @@ -10,10 +10,10 @@ source:
git_rev: {{version}}

build:
number: 5
number: 1
script: " {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "
script_env:
- CFLAGS=-Wno-c++11-narrowing
- CFLAGS=-Wno-c++11-narrowing -Wno-register -Wno-incompatible-function-pointer-types

requirements:
build:
Expand All @@ -30,32 +30,33 @@ requirements:
- {{ cdt('libxxf86vm') }} # [linux]
- {{ cdt('libxext') }} # [linux]
- cmake
- Cython <3
- git
- pip <23
- python {{ python }}
- swig
host:
- Cython # Caused error when in `build:`.
- Cython <3
- fonttools
- numpy {{ numpy }}
- pillow >=9.4
- pip
- pyface >=7.4.2
- pillow >=10.1
- pip <23
- pyface >=8
- pyparsing
- pyside6 >=6.6.1
- python {{ python }}
- qt >=5
- setuptools
- six
- traitsui
- traitsui >=8
- xorg-libxfixes # [linux]
run:
- fonttools
- {{ pin_compatible('numpy') }}
- pillow >=9.4
- pyface >=7.4.2
- pillow >=10.1
- pyface >=8
- pyparsing
- pyside6 >=6.6.1
- python
- qt >=5
- six
- traitsui
- traitsui >=8

test:
imports:
Expand All @@ -65,7 +66,7 @@ test:
- enable.layout
- enable.null
- enable.primitives
- enable.qt4
- enable.qt
- enable.savage
- enable.savage.compliance
- enable.savage.svg
Expand All @@ -78,11 +79,11 @@ test:
- enable.savage.svg.tests.css
- enable.savage.trait_defs
- enable.savage.trait_defs.ui
- enable.savage.trait_defs.ui.qt4
- enable.savage.trait_defs.ui.qt
- enable.savage.trait_defs.ui.wx
- enable.tests
- enable.tests.primitives
- enable.tests.qt4
- enable.tests.qt
- enable.tests.tools
- enable.tests.wx
- enable.tools
Expand All @@ -91,7 +92,7 @@ test:
- enable.tools.toolbars
- enable.trait_defs
- enable.trait_defs.ui
- enable.trait_defs.ui.qt4
- enable.trait_defs.ui.qt
- enable.trait_defs.ui.wx
- enable.wx
- kiva
Expand Down
6 changes: 3 additions & 3 deletions conda.recipe/parsec/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ source:
path: ../../parsec.py

build:
number: 1
number: 2
noarch: "python"
script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "

requirements:
build:
- python >=3.6,<3.10
- python >=3.6,<3.12
- setuptools

run:
- python >=3.6,<3.10
- python >=3.6,<3.12

test:
# Python imports
Expand Down
23 changes: 21 additions & 2 deletions conda.recipe/pybert/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ source:
path: ../../

build:
number: 3
number: 1
script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "
entry_points:
- pybert = pybert.cli:cli
Expand All @@ -22,9 +22,12 @@ requirements:
- {{ compiler('cxx') }}
- cmake
- git
- pip <23
- python {{ python }}
- swig
host:
- numpy {{ numpy }}
- pip <23
- python {{ python }}
- setuptools
{% for dep in deps %}
Expand All @@ -39,7 +42,23 @@ requirements:

test:
imports:
- pybert
- pybert.cli
- pybert.configuration
- pybert.pybert
- pybert.results
- pybert.utility
- pybert.gui.handler
- pybert.gui.help
- pybert.gui.plot
- pybert.gui.view
- pybert.models.bert
- pybert.models.cdr
- pybert.models.dfe
- pybert.models.tx_tap
- pybert.parsers.hspice
- pybert.threads.optimization
- pybert.threads.sim
- pybert.threads.stoppable

about:
dev_url: ''
Expand Down
6 changes: 5 additions & 1 deletion conda.recipe/pyibis-ami/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,18 @@ requirements:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- cmake
- Cython <3
- git
- pip <23
- python {{ python }}
- swig
{% for req in build_reqs %}
- {{ req }}
{% endfor %}
host:
- Cython
- Cython <3
- numpy {{ numpy }}
- pip <23
- python {{ python }}
- setuptools
{% for dep in deps %}
Expand Down
8 changes: 5 additions & 3 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ cxx_compiler:
- clangxx # [osx]
- vs2019 # [win]
numpy:
- 1.23
- 1.25 # 1.26 breaks the Chaco build.
python:
- 3.9
- 3.11
channels:
- local
- dbanas
- defaults
- conda-forge
- defaults
- labscript-suite
12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ build-backend = "setuptools.build_meta"
[project]
name = "PipBERT"
description = "Serial communication link bit error rate tester simulator, written in Python."
version = "4.1.2"
version = "5.1.0rc1"
authors = [ {name = "David Banas", email = "[email protected]"}
, {name = "David Patterson"}
]
urls = { documentation = "https://github.com/capn-freako/PyBERT/wiki"}
readme = "README.md"
requires-python = ">=3.8"
requires-python = ">=3.9,<3.12"
license = {text = "BSD"}
dependencies = [
"kiwisolver",
"PyIBIS-AMI>=4.1.2",
"pyside2",
"PyIBIS-AMI>=5.1.0rc1",
# "pyside2",
"pyyaml>=6",
"qt>=5",
"scikit-rf>=0.24.1",
# "qt>=5",
"scikit-rf>=0.29",
]
keywords=["bert", "communication", "simulator"]
classifiers=[
Expand Down
4 changes: 2 additions & 2 deletions src/pybert/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
# You should only have one of the "ETSConfig.toolkit = ..." lines uncommented.
# fmt: off
# isort: off
from traits.etsconfig.api import ETSConfig
ETSConfig.toolkit = 'qt4' # Yields unacceptably small font sizes in plot axis labels.
# 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.
Expand Down
2 changes: 1 addition & 1 deletion tests/test_sim_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ def test_simulation_can_abort():
sim.the_pybert = app
sim.start() # Start the thread
sim.stop() # Abort the thread
sim.join(10) # Join and wait until it ends or 10 seconds passed.
sim.join(60) # Join and wait until it ends or 10 seconds passed.

assert "Aborted" in app.status_str

0 comments on commit b02f447

Please sign in to comment.