From aee34c6ce314c23c2f0bfffb1abdf91f48ea4531 Mon Sep 17 00:00:00 2001 From: Tamar Ervin Date: Thu, 21 Apr 2022 14:12:39 -0700 Subject: [PATCH] modules --- SolAster/examples/full_pipeline.ipynb | 21 ++++++++++++++++++--- setup.py | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/SolAster/examples/full_pipeline.ipynb b/SolAster/examples/full_pipeline.ipynb index 433c220..35f6661 100644 --- a/SolAster/examples/full_pipeline.ipynb +++ b/SolAster/examples/full_pipeline.ipynb @@ -14,13 +14,25 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 6, "metadata": { "pycharm": { "name": "#%%\n" } }, - "outputs": [], + "outputs": [ + { + "ename": "ModuleNotFoundError", + "evalue": "No module named 'SolAster.tools'", + "output_type": "error", + "traceback": [ + "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m", + "\u001b[0;31mModuleNotFoundError\u001b[0m Traceback (most recent call last)", + "\u001b[0;32m\u001b[0m in \u001b[0;36m\u001b[0;34m\u001b[0m\n\u001b[1;32m 10\u001b[0m \u001b[0msys\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mpath\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mappend\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'/Users/tamarervin/SolAster'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 11\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 12\u001b[0;31m \u001b[0;32mimport\u001b[0m \u001b[0mSolAster\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mtools\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mrvs\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mrvs\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 13\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mSolAster\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mtools\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcalculation_funcs\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0msfuncs\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 14\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mSolAster\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mtools\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mlbc_funcs\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mlbfuncs\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n", + "\u001b[0;31mModuleNotFoundError\u001b[0m: No module named 'SolAster.tools'" + ] + } + ], "source": [ "import pandas as pd\n", "import numpy as np\n", @@ -30,6 +42,9 @@ "from sunpy.net import attrs as a\n", "from sunpy.coordinates import frames\n", "\n", + "import sys\n", + "sys.path.append('/Users/tamarervin/SolAster')\n", + "\n", "import SolAster.tools.rvs as rvs\n", "import SolAster.tools.calculation_funcs as sfuncs\n", "import SolAster.tools.lbc_funcs as lbfuncs\n", @@ -448,7 +463,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.8" + "version": "3.7.6" } }, "nbformat": 4, diff --git a/setup.py b/setup.py index 6dfcd5a..821bdf7 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ name='SolAster', version='1.0.5', packages=['SolAster', 'SolAster.tools', 'SolAster.source', 'SolAster.examples'], - install_requires=['astropy', 'sunpy', 'scikit-image'], + install_requires=['astropy', 'sunpy', 'scikit-image', 'SolAster.tools', 'SolAster.source', 'SolAster.examples'], url='https://github.com/tamarervin/SolAster', license='Apache Software License', author='Tamar Ervin',