added new dependency: cython, numba

modified patch: added new scripts (dolo, dolo-julia)
	remove py-sympy
	tags (py-matplotlib) extra-dependency
This commit is contained in:
Kamel Ibn Aziz Derouiche 2014-05-14 21:57:06 +00:00 committed by Thomas Klausner
parent 9d14d006ef
commit 9c24d618fb
4 changed files with 36 additions and 246 deletions

View file

@ -1,34 +1,36 @@
# $NetBSD: Makefile,v 1.4 2014/04/02 19:42:06 asau Exp $
#
# $NetBSD: Makefile,v 1.5 2014/05/14 21:57:06 jihbed Exp $
DISTNAME= dolo-0.4-dev
DISTNAME= dolo-0.4.9.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
PKGREVISION= 1
CATEGORIES= finance python
MASTER_SITES= http://pypi.python.org/packages/source/d/dolo/
MASTER_SITES= https://pypi.python.org/packages/source/d/dolo/
EXTRACT_SUFX= .zip
MAINTAINER= jihbed.research@gmail.com
HOMEPAGE= http://albop.github.com/dolo/
COMMENT= Economic modelling in Python
LICENSE= 2-clause-bsd
DEPENDS+= ${PYPKGPREFIX}-sympy>=0.7.1:../../math/py-sympy
DEPENDS+= ${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
WRKSRC= ${WRKDIR}/dolo-0.4-dev
USE_LANGUAGES= # none
PY_PATCHPLIST= yes
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PLIST_SUBST+= THIS_EGG_INFODIR=${EGG_NAME:S|-dev|_dev|}-py${PYVERSSUFFIX}.egg-info
post-extract:
${MV} ${WRKSRC}/src/bin/dolo-recs.py \
${WRKSRC}/src/bin/dolo-recs.py${PYVERSSUFFIX}
${MV} ${WRKSRC}/src/bin/dolo-matlab.py \
${WRKSRC}/src/bin/dolo-matlab.py${PYVERSSUFFIX}
${MV} ${WRKSRC}/bin/dolo \
${WRKSRC}/bin/dolo${PYVERSSUFFIX}
${MV} ${WRKSRC}/bin/dolo-julia \
${WRKSRC}/bin/dolo-julia${PYVERSSUFFIX}
${MV} ${WRKSRC}/bin/dolo-recs \
${WRKSRC}/bin/dolo-recs${PYVERSSUFFIX}
${MV} ${WRKSRC}/bin/dolo-matlab \
${WRKSRC}/bin/dolo-matlab${PYVERSSUFFIX}
.include "../../devel/py-cython/buildlink3.mk"
.include "../../graphics/py-matplotlib/buildlink3.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,213 +1 @@
@comment $NetBSD: PLIST,v 1.2 2012/10/27 16:52:10 noud4 Exp $
bin/dolo-matlab.py${PYVERSSUFFIX}
bin/dolo-recs.py${PYVERSSUFFIX}
${PYSITELIB}/${THIS_EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${THIS_EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${THIS_EGG_INFODIR}/dependency_links.txt
${PYSITELIB}/${THIS_EGG_INFODIR}/requires.txt
${PYSITELIB}/${THIS_EGG_INFODIR}/top_level.txt
${PYSITELIB}/dolo/__init__.py
${PYSITELIB}/dolo/__init__.pyc
${PYSITELIB}/dolo/__init__.pyo
${PYSITELIB}/dolo/compiler/__init__.py
${PYSITELIB}/dolo/compiler/__init__.pyc
${PYSITELIB}/dolo/compiler/__init__.pyo
${PYSITELIB}/dolo/compiler/cmodel_theano.py
${PYSITELIB}/dolo/compiler/cmodel_theano.pyc
${PYSITELIB}/dolo/compiler/cmodel_theano.pyo
${PYSITELIB}/dolo/compiler/compiler.py
${PYSITELIB}/dolo/compiler/compiler.pyc
${PYSITELIB}/dolo/compiler/compiler.pyo
${PYSITELIB}/dolo/compiler/compiler_dynare.py
${PYSITELIB}/dolo/compiler/compiler_dynare.pyc
${PYSITELIB}/dolo/compiler/compiler_dynare.pyo
${PYSITELIB}/dolo/compiler/compiler_functions.py
${PYSITELIB}/dolo/compiler/compiler_functions.pyc
${PYSITELIB}/dolo/compiler/compiler_functions.pyo
${PYSITELIB}/dolo/compiler/compiler_global.py
${PYSITELIB}/dolo/compiler/compiler_global.pyc
${PYSITELIB}/dolo/compiler/compiler_global.pyo
${PYSITELIB}/dolo/compiler/compiler_matlab.py
${PYSITELIB}/dolo/compiler/compiler_matlab.pyc
${PYSITELIB}/dolo/compiler/compiler_matlab.pyo
${PYSITELIB}/dolo/compiler/compiler_mirfac.py
${PYSITELIB}/dolo/compiler/compiler_mirfac.pyc
${PYSITELIB}/dolo/compiler/compiler_mirfac.pyo
${PYSITELIB}/dolo/compiler/compiler_python.py
${PYSITELIB}/dolo/compiler/compiler_python.pyc
${PYSITELIB}/dolo/compiler/compiler_python.pyo
${PYSITELIB}/dolo/compiler/compiler_uhlig.py
${PYSITELIB}/dolo/compiler/compiler_uhlig.pyc
${PYSITELIB}/dolo/compiler/compiler_uhlig.pyo
${PYSITELIB}/dolo/compiler/compiling.py
${PYSITELIB}/dolo/compiler/compiling.pyc
${PYSITELIB}/dolo/compiler/compiling.pyo
${PYSITELIB}/dolo/compiler/compiling_fast.py
${PYSITELIB}/dolo/compiler/compiling_fast.pyc
${PYSITELIB}/dolo/compiler/compiling_fast.pyo
${PYSITELIB}/dolo/compiler/compiling_very_fast.py
${PYSITELIB}/dolo/compiler/compiling_very_fast.pyc
${PYSITELIB}/dolo/compiler/compiling_very_fast.pyo
${PYSITELIB}/dolo/compiler/global_solution.py
${PYSITELIB}/dolo/compiler/global_solution.pyc
${PYSITELIB}/dolo/compiler/global_solution.pyo
${PYSITELIB}/dolo/config.py
${PYSITELIB}/dolo/config.pyc
${PYSITELIB}/dolo/config.pyo
${PYSITELIB}/dolo/misc/__init__.py
${PYSITELIB}/dolo/misc/__init__.pyc
${PYSITELIB}/dolo/misc/__init__.pyo
${PYSITELIB}/dolo/misc/caching.py
${PYSITELIB}/dolo/misc/caching.pyc
${PYSITELIB}/dolo/misc/caching.pyo
${PYSITELIB}/dolo/misc/calculus.py
${PYSITELIB}/dolo/misc/calculus.pyc
${PYSITELIB}/dolo/misc/calculus.pyo
${PYSITELIB}/dolo/misc/commands.py
${PYSITELIB}/dolo/misc/commands.pyc
${PYSITELIB}/dolo/misc/commands.pyo
${PYSITELIB}/dolo/misc/macros.py
${PYSITELIB}/dolo/misc/matlab.py
${PYSITELIB}/dolo/misc/matlab.pyc
${PYSITELIB}/dolo/misc/matlab.pyo
${PYSITELIB}/dolo/misc/misc.py
${PYSITELIB}/dolo/misc/misc.pyc
${PYSITELIB}/dolo/misc/misc.pyo
${PYSITELIB}/dolo/misc/modfile.py
${PYSITELIB}/dolo/misc/modfile.pyc
${PYSITELIB}/dolo/misc/modfile.pyo
${PYSITELIB}/dolo/misc/nth_order_derivatives.py
${PYSITELIB}/dolo/misc/nth_order_derivatives.pyc
${PYSITELIB}/dolo/misc/nth_order_derivatives.pyo
${PYSITELIB}/dolo/misc/octave.py
${PYSITELIB}/dolo/misc/octave.pyc
${PYSITELIB}/dolo/misc/octave.pyo
${PYSITELIB}/dolo/misc/preview_html.py
${PYSITELIB}/dolo/misc/preview_html.pyc
${PYSITELIB}/dolo/misc/preview_html.pyo
${PYSITELIB}/dolo/misc/preview_latex.py
${PYSITELIB}/dolo/misc/preview_latex.pyc
${PYSITELIB}/dolo/misc/preview_latex.pyo
${PYSITELIB}/dolo/misc/printing.py
${PYSITELIB}/dolo/misc/printing.pyc
${PYSITELIB}/dolo/misc/printing.pyo
${PYSITELIB}/dolo/misc/symbolic_interactive.py
${PYSITELIB}/dolo/misc/symbolic_interactive.pyc
${PYSITELIB}/dolo/misc/symbolic_interactive.pyo
${PYSITELIB}/dolo/misc/triangular_solver.py
${PYSITELIB}/dolo/misc/triangular_solver.pyc
${PYSITELIB}/dolo/misc/triangular_solver.pyo
${PYSITELIB}/dolo/misc/yamlfile.py
${PYSITELIB}/dolo/misc/yamlfile.pyc
${PYSITELIB}/dolo/misc/yamlfile.pyo
${PYSITELIB}/dolo/numeric/__init__.py
${PYSITELIB}/dolo/numeric/__init__.pyc
${PYSITELIB}/dolo/numeric/__init__.pyo
${PYSITELIB}/dolo/numeric/decision_rules.py
${PYSITELIB}/dolo/numeric/decision_rules.pyc
${PYSITELIB}/dolo/numeric/decision_rules.pyo
${PYSITELIB}/dolo/numeric/decision_rules_states.py
${PYSITELIB}/dolo/numeric/decision_rules_states.pyc
${PYSITELIB}/dolo/numeric/decision_rules_states.pyo
${PYSITELIB}/dolo/numeric/error_measures.py
${PYSITELIB}/dolo/numeric/error_measures.pyc
${PYSITELIB}/dolo/numeric/error_measures.pyo
${PYSITELIB}/dolo/numeric/extern/__init__.py
${PYSITELIB}/dolo/numeric/extern/__init__.pyc
${PYSITELIB}/dolo/numeric/extern/__init__.pyo
${PYSITELIB}/dolo/numeric/extern/helpers.py
${PYSITELIB}/dolo/numeric/extern/helpers.pyc
${PYSITELIB}/dolo/numeric/extern/helpers.pyo
${PYSITELIB}/dolo/numeric/extern/lmmcp.py
${PYSITELIB}/dolo/numeric/extern/lmmcp.pyc
${PYSITELIB}/dolo/numeric/extern/lmmcp.pyo
${PYSITELIB}/dolo/numeric/extern/qz.py
${PYSITELIB}/dolo/numeric/extern/qz.pyc
${PYSITELIB}/dolo/numeric/extern/qz.pyo
${PYSITELIB}/dolo/numeric/filters.py
${PYSITELIB}/dolo/numeric/filters.pyc
${PYSITELIB}/dolo/numeric/filters.pyo
${PYSITELIB}/dolo/numeric/global_solve.py
${PYSITELIB}/dolo/numeric/global_solve.pyc
${PYSITELIB}/dolo/numeric/global_solve.pyo
${PYSITELIB}/dolo/numeric/interpolation.py
${PYSITELIB}/dolo/numeric/interpolation.pyc
${PYSITELIB}/dolo/numeric/interpolation.pyo
${PYSITELIB}/dolo/numeric/matrix_equations.py
${PYSITELIB}/dolo/numeric/matrix_equations.pyc
${PYSITELIB}/dolo/numeric/matrix_equations.pyo
${PYSITELIB}/dolo/numeric/misc.py
${PYSITELIB}/dolo/numeric/misc.pyc
${PYSITELIB}/dolo/numeric/misc.pyo
${PYSITELIB}/dolo/numeric/multilinear.py
${PYSITELIB}/dolo/numeric/multilinear.pyc
${PYSITELIB}/dolo/numeric/multilinear.pyo
${PYSITELIB}/dolo/numeric/newton.py
${PYSITELIB}/dolo/numeric/newton.pyc
${PYSITELIB}/dolo/numeric/newton.pyo
${PYSITELIB}/dolo/numeric/perturbations.py
${PYSITELIB}/dolo/numeric/perturbations.pyc
${PYSITELIB}/dolo/numeric/perturbations.pyo
${PYSITELIB}/dolo/numeric/perturbations_dynare.py
${PYSITELIB}/dolo/numeric/perturbations_dynare.pyc
${PYSITELIB}/dolo/numeric/perturbations_dynare.pyo
${PYSITELIB}/dolo/numeric/perturbations_to_states.py
${PYSITELIB}/dolo/numeric/perturbations_to_states.pyc
${PYSITELIB}/dolo/numeric/perturbations_to_states.pyo
${PYSITELIB}/dolo/numeric/portfolio_perturbation.py
${PYSITELIB}/dolo/numeric/portfolio_perturbation.pyc
${PYSITELIB}/dolo/numeric/portfolio_perturbation.pyo
${PYSITELIB}/dolo/numeric/pytave_interpolation.py
${PYSITELIB}/dolo/numeric/pytave_interpolation.pyc
${PYSITELIB}/dolo/numeric/pytave_interpolation.pyo
${PYSITELIB}/dolo/numeric/quadrature.py
${PYSITELIB}/dolo/numeric/quadrature.pyc
${PYSITELIB}/dolo/numeric/quadrature.pyo
${PYSITELIB}/dolo/numeric/quantization.py
${PYSITELIB}/dolo/numeric/quantization.pyc
${PYSITELIB}/dolo/numeric/quantization.pyo
${PYSITELIB}/dolo/numeric/risky_ss.py
${PYSITELIB}/dolo/numeric/risky_ss.pyc
${PYSITELIB}/dolo/numeric/risky_ss.pyo
${PYSITELIB}/dolo/numeric/serial_operations.py
${PYSITELIB}/dolo/numeric/serial_operations.pyc
${PYSITELIB}/dolo/numeric/serial_operations.pyo
${PYSITELIB}/dolo/numeric/serial_operations_c.py
${PYSITELIB}/dolo/numeric/serial_operations_c.pyc
${PYSITELIB}/dolo/numeric/serial_operations_c.pyo
${PYSITELIB}/dolo/numeric/simulations.py
${PYSITELIB}/dolo/numeric/simulations.pyc
${PYSITELIB}/dolo/numeric/simulations.pyo
${PYSITELIB}/dolo/numeric/smolyak.py
${PYSITELIB}/dolo/numeric/smolyak.pyc
${PYSITELIB}/dolo/numeric/smolyak.pyo
${PYSITELIB}/dolo/numeric/solver.py
${PYSITELIB}/dolo/numeric/solver.pyc
${PYSITELIB}/dolo/numeric/solver.pyo
${PYSITELIB}/dolo/numeric/tauchen.py
${PYSITELIB}/dolo/numeric/tauchen.pyc
${PYSITELIB}/dolo/numeric/tauchen.pyo
${PYSITELIB}/dolo/numeric/tensor.py
${PYSITELIB}/dolo/numeric/tensor.pyc
${PYSITELIB}/dolo/numeric/tensor.pyo
${PYSITELIB}/dolo/numeric/timeseries.py
${PYSITELIB}/dolo/numeric/timeseries.pyc
${PYSITELIB}/dolo/numeric/timeseries.pyo
${PYSITELIB}/dolo/symbolic/__init__.py
${PYSITELIB}/dolo/symbolic/__init__.pyc
${PYSITELIB}/dolo/symbolic/__init__.pyo
${PYSITELIB}/dolo/symbolic/derivatives.py
${PYSITELIB}/dolo/symbolic/derivatives.pyc
${PYSITELIB}/dolo/symbolic/derivatives.pyo
${PYSITELIB}/dolo/symbolic/model.py
${PYSITELIB}/dolo/symbolic/model.pyc
${PYSITELIB}/dolo/symbolic/model.pyo
${PYSITELIB}/dolo/symbolic/ramsey.py
${PYSITELIB}/dolo/symbolic/ramsey.pyc
${PYSITELIB}/dolo/symbolic/ramsey.pyo
${PYSITELIB}/dolo/symbolic/symbolic.py
${PYSITELIB}/dolo/symbolic/symbolic.pyc
${PYSITELIB}/dolo/symbolic/symbolic.pyo
${PYSITELIB}/dolo/symbolic/symbolic_sympy_3.py
${PYSITELIB}/dolo/symbolic/symbolic_sympy_3.pyc
${PYSITELIB}/dolo/symbolic/symbolic_sympy_3.pyo
@comment $NetBSD: PLIST,v 1.3 2014/05/14 21:57:06 jihbed Exp $

View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.1 2012/09/10 22:11:34 jihbed Exp $
$NetBSD: distinfo,v 1.2 2014/05/14 21:57:06 jihbed Exp $
SHA1 (dolo-0.4-dev.tar.gz) = 88496806cea821bc662d81b665d2abe33f9d494d
RMD160 (dolo-0.4-dev.tar.gz) = cac6617e5915b0ecd84f71586311118558def98a
Size (dolo-0.4-dev.tar.gz) = 100303 bytes
SHA1 (patch-setup.py) = 4d32fcc1948dbb7103855abd0214a98e566f221e
SHA1 (dolo-0.4.9.2.zip) = 9b4555dfa215324f706cf772f09790569438c125
RMD160 (dolo-0.4.9.2.zip) = dbe94d4c7a12769cd7603b05d21e143a930b171c
Size (dolo-0.4.9.2.zip) = 121429 bytes
SHA1 (patch-setup.py) = 6aff8cddfaf05fefbf41bedd2dbc06cc7eab50e8

View file

@ -1,19 +1,19 @@
$NetBSD: patch-setup.py,v 1.1 2012/09/10 22:11:35 jihbed Exp $
$NetBSD: patch-setup.py,v 1.2 2014/05/14 21:57:06 jihbed Exp $
--- setup.py.orig 2012-09-10 22:28:50.000000000 +0100
+++ setup.py 2012-09-10 22:32:45.000000000 +0100
@@ -1,4 +1,5 @@
from setuptools import setup, find_packages
--- setup.py.orig 2014-05-14 22:12:44.000000000 +0100
+++ setup.py 2014-05-14 22:17:16.000000000 +0100
@@ -1,3 +1,5 @@
+import sys
+
from setuptools import setup, find_packages
from distutils.extension import Extension
__version__ = "0.4-dev"
@@ -19,7 +21,7 @@
include_dirs = [np.get_include()],
- scripts = ['bin/dolo-recs', 'bin/dolo-matlab', 'bin/dolo-julia', 'bin/dolo'],
+ scripts = ['bin/dolo-recs'+sys.version[0:3], 'bin/dolo-matlab'+sys.version[0:3], 'bin/dolo-julia'+sys.version[0:3], 'bin/dolo'+sys.version[0:3]],
install_requires = ["pyyaml","numba","numpy","cython"],
@@ -7,7 +8,7 @@
version = __version__,
packages = find_packages('src'),
package_dir = {'':'src'},
- scripts = ['src/bin/dolo-recs.py', 'src/bin/dolo-matlab.py'],
+ scripts = ['src/bin/dolo-recs.py'+sys.version[0:3], 'src/bin/dolo-matlab.py'+sys.version[0:3]],
install_requires = ["pyyaml","sympy","numpy","matplotlib"],
author = "Pablo Winant",
author_email = "pablo.winant@gmail.com",