From 3f95a38337c30a5bf388b941b457dec1d019aed3 Mon Sep 17 00:00:00 2001
From: "Olivier J.N. Bertrand" <bolirev@hotmail.com>
Date: Sat, 25 Nov 2017 23:07:01 +0100
Subject: [PATCH] Add todo
---
navipy/comparing/__init__.py | 2 +-
navipy/processing/test.py | 9 +++--
setup.py | 72 ++++++++++++++++++------------------
todo | 2 +
4 files changed, 45 insertions(+), 40 deletions(-)
create mode 100644 todo
diff --git a/navipy/comparing/__init__.py b/navipy/comparing/__init__.py
index 50d03ba..4d87d7d 100644
--- a/navipy/comparing/__init__.py
+++ b/navipy/comparing/__init__.py
@@ -4,7 +4,7 @@ compare a current place to a memorised place or
memorised places.
"""
import numpy as np
-from Scene_processing import is_ibpc, is_obpc
+from navipy.processing.tools import is_ibpc, is_obpc
def imagediff(current, memory):
diff --git a/navipy/processing/test.py b/navipy/processing/test.py
index 4759bb4..eb7ab65 100644
--- a/navipy/processing/test.py
+++ b/navipy/processing/test.py
@@ -3,8 +3,8 @@ import sqlite3
import numpy as np
import pandas as pd
import os.path as path
-from ..database import database
-import __init__ as processing
+from navipy.database import database
+import navipy.processing as processing
def is_numeric_array(array):
@@ -64,8 +64,9 @@ def build_test_db():
class TestCase(unittest.TestCase):
def setUp(self):
- one_up = path.abspath(path.join(__file__, "../"))
- self.mydb_filename = one_up+'/database.db'
+ import os
+ print(os.getcwd())
+ self.mydb_filename = os.path.abspath('navipy/resources/database.db')
self.mydb = database.DataBaseLoad(self.mydb_filename)
diff --git a/setup.py b/setup.py
index 78fd495..7b3059e 100644
--- a/setup.py
+++ b/setup.py
@@ -1,35 +1,37 @@
-from distutils.core import setup
-# from distutils import util
-import site
-
-if __name__ == "__main__":
- site_package_path = site.getsitepackages()
- setup(
- name='navigationToolbox',
- package_dir={
- 'navigationToolbox': 'src',
- 'navigationToolbox.database': 'src/database',
- 'navigationToolbox.processing': 'src/processing',
- # 'navigation-toolbox.rendering': 'src/rendering',
- # 'navigation-toolbox.comparing': 'src/comparing'
- },
- packages=[
- 'navigationToolbox',
- 'navigationToolbox.database',
- 'navigationToolbox.processing',
- # 'navigation-toolbox.rendering',
- # 'navigation-toolbox.comparing'
- ],
- data_files=[
- (site_package_path[0] +
- '/navigationToolbox',
- ['src/database.db'])
- ],
- version='0.1',
- description='The toolbox used by the research'
- ' group Neurobiology at Bielefeld Univeristy',
- url='https://lamina.biologie.uni-bielefeld.de/',
- author='Members of the research group',
- author_email='olivier.bertrand@uni-bielefeld.de',
- license='Bielefeld University',
- )
+#!/usr/bin/env python
+"""
+setup.py for Insect Navigation Toolbox (called navipy)
+
+"""
+import sys
+import os
+from setuptools import setup, find_packages, Extension
+
+excluded = []
+
+
+def exclude_package(pkg):
+ for exclude in excluded:
+ if pkg.startswith(exclude):
+ return True
+ return False
+
+
+def create_package_list(base_package):
+ return ([base_package] +
+ [base_package + '.' + pkg
+ for pkg
+ in find_packages(base_package)
+ if not exclude_package(pkg)])
+
+
+setup_dict = {'name': 'navipy',
+ 'version': '0.1',
+ 'author': "Olivier J.N. Bertrand",
+ 'author_email': 'olivier.bertrand@uni-bielefeld.de',
+ 'description': 'Insect Navigation Toolbox',
+ 'packages': create_package_list("navipy"),
+ 'requires': ['numpy', 'pandas', 'matplotlib', 'scipy'],
+ 'install_requires': ["numpy", 'pandas', 'matplotlib', 'scipy']}
+
+setup(**setup_dict)
diff --git a/todo b/todo
new file mode 100644
index 0000000..612f232
--- /dev/null
+++ b/todo
@@ -0,0 +1,2 @@
+- Fix db in test function such that it work from any location. (probably need to add a module resources and function to load them)
+- Test are failing WHY???
--
GitLab