Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fixes Pip installed NumPy performance issue. #115

Merged
merged 7 commits into from
Jan 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ share/python-wheels/
.installed.cfg
*.egg
MANIFEST
*.out

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down
2 changes: 1 addition & 1 deletion PyAMI
23 changes: 12 additions & 11 deletions conda.recipe/chaco/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,33 @@ package:

source:
git_url: https://github.com/enthought/chaco.git
# git_rev: 5.0.0
git_rev: {{ version }}
build:
number: 1
number: 2
script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv "

requirements:
build:
- 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')}}
- git
- cmake

host:
- python
- enable ={{ enable_version }}
- Cython
- enable ={{ enable_version }}
- git
- importlib_resources
- numpy x.x
- pyface >=7.4.2
- 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
- pyface >=7.4.2
- python

test:
# Python imports
Expand Down
8 changes: 0 additions & 8 deletions conda.recipe/empy/bld.bat

This file was deleted.

9 changes: 0 additions & 9 deletions conda.recipe/empy/build.sh

This file was deleted.

60 changes: 0 additions & 60 deletions conda.recipe/empy/meta.yaml

This file was deleted.

5 changes: 2 additions & 3 deletions conda.recipe/enable/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ requirements:
- setuptools
- git
- cmake
- swig =3
- swig
# - {{compiler('c')}}
# - {{ compiler('cxx') }}
# - {{ cdt('xorg-x11-devel') }} # [linux]
# - vs2017_win-64
- vs2019_win-64
# - vs2019_win-64
host:
- fonttools
- numpy
Expand Down
27 changes: 14 additions & 13 deletions conda.recipe/pybert/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "pybert" %}
{% set version = "4.0.0" %}
{% set version = "4.0.4" %}
capn-freako marked this conversation as resolved.
Show resolved Hide resolved

package:
version: '{{ version }}'
Expand All @@ -17,23 +17,24 @@ build:

requirements:
run:
- python >=3.8 <3.10
- kiwisolver
- chaco =5.0.0.2
- pyibis-ami >=3.5.7
- scikit-rf
- pyside2
- numpy x.x
- pyibis-ami >=4.0.5
- pyside6
capn-freako marked this conversation as resolved.
Show resolved Hide resolved
- python >=3.8
- pyyaml
- importlib_resources
- qt =5
- scikit-rf >=0.24.1
build:
- python =3.8
- setuptools
- kiwisolver
- chaco =5.0.0.2
- pyibis-ami >=3.5.7
- scikit-rf
- pyside2
- numpy x.x
- pyibis-ami >=4.0.5
- pyside6
- python >=3.8
- pyyaml
- qt =5
- scikit-rf >=0.24.1
- setuptools

test:
imports:
Expand Down
10 changes: 7 additions & 3 deletions conda.recipe/pyibis-ami/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "pyibis-ami" %}
{% set version = "3.5.8" %}
{% set version = "4.0.5" %}

package:
version: '{{ version }}'
Expand All @@ -19,19 +19,23 @@ build:

requirements:
run:
- python >=3.8
- chaco >=5.1.0
- click
- empy
- matplotlib
- numpy x.x
- parsec >=3.13
- python >=3.8
- scipy

build:
- python >=3.8
- chaco >=5.1.0
- click
- empy
- matplotlib
- numpy x.x
- parsec >=3.13
- python >=3.8
- scipy
- setuptools

Expand Down
15 changes: 7 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ requires = ["setuptools>=45"]
build-backend = "setuptools.build_meta"

[project]
name = "PyBERT"
name = "PipBERT"
description = "Serial communication link bit error rate tester simulator, written in Python."
version = "4.0.0"
version = "4.0.4"
authors = [ {name = "David Banas", email = "capn.freako@gmail.com"}
, {name = "David Patterson"}
]
Expand All @@ -14,18 +14,17 @@ readme = "README.md"
requires-python = ">=3.8"
license = {text = "BSD"}
dependencies = [
# "blas>=1.0", # I thought this might fix my performance test failure.
"chaco==5.1.0",
"click==8.1.3",
"enable==5.3.1",
"numpy==1.23.3",
"numpy>=1.22.3,<1.23",
"PyIBIS-AMI>=4.0.5",
"pyside6",
"pyyaml==6.0",
"scikit-rf==0.24.1",
"scipy==1.9.2",
"scipy==1.9.3",
"traits==6.4.1",
"traitsui==7.4.1",
"PyIBIS-AMI>=4.0.0",
"pyyaml==6.0",
"pyside2==5.15.2.1",
]
keywords=["bert", "communication", "simulator"]
classifiers=[
Expand Down
2 changes: 1 addition & 1 deletion src/pybert/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Copyright (c) 2014 by David Banas; All rights reserved World wide.
"""
__version__ = "4.0.0"
__version__ = "4.0.4"
__date__ = "November 27, 2022"
__authors__ = "David Banas & David Patterson"
__copy__ = "Copyright (c) 2014 David Banas, 2019 David Patterson"
3 changes: 2 additions & 1 deletion src/pybert/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@

import click

from pybert import __version__
from pybert.gui.view import traits_view
from pybert.pybert import PyBERT


@click.group(invoke_without_command=True, context_settings=dict(help_option_names=["-h", "--help"]))
@click.pass_context
@click.version_option()
@click.version_option(version=__version__)
@click.option("--config-file", "-c", type=click.Path(exists=True), help="Load an existing configuration file.")
@click.option("--results", "-r", type=click.Path(exists=True), help="Load results from a prior run.")
def cli(ctx, config_file, results):
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ deps =
pytest-xdist
pytest-cov
conda_deps =
numpy==1.23.3 # Version number required! Conda ignores `pyproject.toml`.
# numpy==1.23.3 # Version number required! Conda ignores `pyproject.toml`.
conda_channels =
defaults
conda-forge
Expand Down