From 91ed5fc1327f8292dbee3791631b3b778ac532ff Mon Sep 17 00:00:00 2001 From: Gilad Goldfarb Date: Fri, 14 Jul 2017 21:11:36 -0700 Subject: [PATCH] include gnpy functionality imports into __init__.py, fix requirements to include scipy, numpy --- gnpy/__init__.py | 6 ++++++ setup.py | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gnpy/__init__.py b/gnpy/__init__.py index 40a96afc..76e0ece3 100644 --- a/gnpy/__init__.py +++ b/gnpy/__init__.py @@ -1 +1,7 @@ # -*- coding: utf-8 -*- + +from .gnpy import (raised_cosine_comb, analytic_formula, compute_psi, fwm_eff, + get_f_computed_interp, get_freqarray, gn_analytic, gn_model, + interpolate_in_range, GN_integral) + +__all__ = ['gnpy'] diff --git a/setup.py b/setup.py index ccdd6597..326df1e6 100644 --- a/setup.py +++ b/setup.py @@ -13,6 +13,8 @@ with open('HISTORY.rst') as history_file: requirements = [ 'Click>=6.0', + 'numpy', + 'scipy' # TODO: put package requirements here ] @@ -33,7 +35,7 @@ setup( long_description=readme + '\n\n' + history, author="", author_email='@.com', - url='https://github.com//gnpy', + url='https://github.com/Telecominfraproject/gnpy', packages=find_packages(include=['gnpy']), entry_points={ 'console_scripts': [