From 87115964592e82e8d70d5077142951a456514633 Mon Sep 17 00:00:00 2001
From: Luc Giffon <luc.giffon@lis-lab.fr>
Date: Mon, 4 Nov 2019 14:49:00 +0100
Subject: [PATCH] =?UTF-8?q?rassemble=20le=20code=20dans=20un=20r=C3=A9pert?=
 =?UTF-8?q?oire=20'code'=20+=20update=20setup.py=20en=20cons=C3=A9quence?=
 =?UTF-8?q?=20+=20ajoute=20scikit-learn=20=C3=A0=20requirements.txt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {bolsonaro => code/bolsonaro}/__init__.py                     | 0
 {bolsonaro => code/bolsonaro}/data/.gitkeep                   | 0
 {bolsonaro => code/bolsonaro}/data/__init__.py                | 0
 {bolsonaro => code/bolsonaro}/data/dataset.py                 | 0
 {bolsonaro => code/bolsonaro}/data/dataset_loader.py          | 4 ++--
 {bolsonaro => code/bolsonaro}/data/dataset_parameters.py      | 0
 {bolsonaro => code/bolsonaro}/data/task.py                    | 0
 {bolsonaro => code/bolsonaro}/error_handling/__init__.py      | 0
 {bolsonaro => code/bolsonaro}/error_handling/color_print.py   | 0
 .../bolsonaro}/error_handling/console_logger.py               | 2 +-
 .../bolsonaro}/error_handling/exception_decorators.py         | 0
 .../bolsonaro}/error_handling/logger_factory.py               | 0
 {bolsonaro => code/bolsonaro}/models/.gitkeep                 | 0
 {bolsonaro => code/bolsonaro}/models/__init__.py              | 0
 {bolsonaro => code/bolsonaro}/models/model_factory.py         | 0
 {bolsonaro => code/bolsonaro}/models/model_parameters.py      | 0
 {bolsonaro => code/bolsonaro}/models/omp_forest_classifier.py | 0
 {bolsonaro => code/bolsonaro}/models/omp_forest_regressor.py  | 0
 {bolsonaro => code/bolsonaro}/trainer.py                      | 0
 {bolsonaro => code/bolsonaro}/utils.py                        | 0
 {bolsonaro => code/bolsonaro}/visualization/.gitkeep          | 0
 {bolsonaro => code/bolsonaro}/visualization/__init__.py       | 0
 {bolsonaro => code/bolsonaro}/visualization/plotter.py        | 0
 {bolsonaro => code/bolsonaro}/visualization/visualize.py      | 0
 compute_results.py => code/compute_results.py                 | 0
 train.py => code/train.py                                     | 0
 visualize.py => code/visualize.py                             | 0
 requirements.txt                                              | 1 +
 setup.py                                                      | 3 ++-
 29 files changed, 6 insertions(+), 4 deletions(-)
 rename {bolsonaro => code/bolsonaro}/__init__.py (100%)
 rename {bolsonaro => code/bolsonaro}/data/.gitkeep (100%)
 rename {bolsonaro => code/bolsonaro}/data/__init__.py (100%)
 rename {bolsonaro => code/bolsonaro}/data/dataset.py (100%)
 rename {bolsonaro => code/bolsonaro}/data/dataset_loader.py (95%)
 rename {bolsonaro => code/bolsonaro}/data/dataset_parameters.py (100%)
 rename {bolsonaro => code/bolsonaro}/data/task.py (100%)
 rename {bolsonaro => code/bolsonaro}/error_handling/__init__.py (100%)
 rename {bolsonaro => code/bolsonaro}/error_handling/color_print.py (100%)
 rename {bolsonaro => code/bolsonaro}/error_handling/console_logger.py (98%)
 rename {bolsonaro => code/bolsonaro}/error_handling/exception_decorators.py (100%)
 rename {bolsonaro => code/bolsonaro}/error_handling/logger_factory.py (100%)
 rename {bolsonaro => code/bolsonaro}/models/.gitkeep (100%)
 rename {bolsonaro => code/bolsonaro}/models/__init__.py (100%)
 rename {bolsonaro => code/bolsonaro}/models/model_factory.py (100%)
 rename {bolsonaro => code/bolsonaro}/models/model_parameters.py (100%)
 rename {bolsonaro => code/bolsonaro}/models/omp_forest_classifier.py (100%)
 rename {bolsonaro => code/bolsonaro}/models/omp_forest_regressor.py (100%)
 rename {bolsonaro => code/bolsonaro}/trainer.py (100%)
 rename {bolsonaro => code/bolsonaro}/utils.py (100%)
 rename {bolsonaro => code/bolsonaro}/visualization/.gitkeep (100%)
 rename {bolsonaro => code/bolsonaro}/visualization/__init__.py (100%)
 rename {bolsonaro => code/bolsonaro}/visualization/plotter.py (100%)
 rename {bolsonaro => code/bolsonaro}/visualization/visualize.py (100%)
 rename compute_results.py => code/compute_results.py (100%)
 rename train.py => code/train.py (100%)
 rename visualize.py => code/visualize.py (100%)

diff --git a/bolsonaro/__init__.py b/code/bolsonaro/__init__.py
similarity index 100%
rename from bolsonaro/__init__.py
rename to code/bolsonaro/__init__.py
diff --git a/bolsonaro/data/.gitkeep b/code/bolsonaro/data/.gitkeep
similarity index 100%
rename from bolsonaro/data/.gitkeep
rename to code/bolsonaro/data/.gitkeep
diff --git a/bolsonaro/data/__init__.py b/code/bolsonaro/data/__init__.py
similarity index 100%
rename from bolsonaro/data/__init__.py
rename to code/bolsonaro/data/__init__.py
diff --git a/bolsonaro/data/dataset.py b/code/bolsonaro/data/dataset.py
similarity index 100%
rename from bolsonaro/data/dataset.py
rename to code/bolsonaro/data/dataset.py
diff --git a/bolsonaro/data/dataset_loader.py b/code/bolsonaro/data/dataset_loader.py
similarity index 95%
rename from bolsonaro/data/dataset_loader.py
rename to code/bolsonaro/data/dataset_loader.py
index c510a90..dc6382c 100644
--- a/bolsonaro/data/dataset_loader.py
+++ b/code/bolsonaro/data/dataset_loader.py
@@ -1,5 +1,5 @@
-from bolsonaro.data.dataset import Dataset
-from bolsonaro.data.task import Task
+from bolsonaro.data import Dataset
+from bolsonaro.data import Task
 
 from sklearn.datasets import load_boston, load_iris, load_diabetes, load_digits, load_linnerud, load_wine, load_breast_cancer
 from sklearn.datasets import fetch_olivetti_faces, fetch_20newsgroups, \
diff --git a/bolsonaro/data/dataset_parameters.py b/code/bolsonaro/data/dataset_parameters.py
similarity index 100%
rename from bolsonaro/data/dataset_parameters.py
rename to code/bolsonaro/data/dataset_parameters.py
diff --git a/bolsonaro/data/task.py b/code/bolsonaro/data/task.py
similarity index 100%
rename from bolsonaro/data/task.py
rename to code/bolsonaro/data/task.py
diff --git a/bolsonaro/error_handling/__init__.py b/code/bolsonaro/error_handling/__init__.py
similarity index 100%
rename from bolsonaro/error_handling/__init__.py
rename to code/bolsonaro/error_handling/__init__.py
diff --git a/bolsonaro/error_handling/color_print.py b/code/bolsonaro/error_handling/color_print.py
similarity index 100%
rename from bolsonaro/error_handling/color_print.py
rename to code/bolsonaro/error_handling/color_print.py
diff --git a/bolsonaro/error_handling/console_logger.py b/code/bolsonaro/error_handling/console_logger.py
similarity index 98%
rename from bolsonaro/error_handling/console_logger.py
rename to code/bolsonaro/error_handling/console_logger.py
index 7014b4c..93d34d6 100644
--- a/bolsonaro/error_handling/console_logger.py
+++ b/code/bolsonaro/error_handling/console_logger.py
@@ -24,7 +24,7 @@
  #   SOFTWARE.                                                                       #
  #####################################################################################
 
-from error_handling.color_print import ColorPrint
+from bolsonaro.error_handling.color_print import ColorPrint
 
 import sys
 import traceback
diff --git a/bolsonaro/error_handling/exception_decorators.py b/code/bolsonaro/error_handling/exception_decorators.py
similarity index 100%
rename from bolsonaro/error_handling/exception_decorators.py
rename to code/bolsonaro/error_handling/exception_decorators.py
diff --git a/bolsonaro/error_handling/logger_factory.py b/code/bolsonaro/error_handling/logger_factory.py
similarity index 100%
rename from bolsonaro/error_handling/logger_factory.py
rename to code/bolsonaro/error_handling/logger_factory.py
diff --git a/bolsonaro/models/.gitkeep b/code/bolsonaro/models/.gitkeep
similarity index 100%
rename from bolsonaro/models/.gitkeep
rename to code/bolsonaro/models/.gitkeep
diff --git a/bolsonaro/models/__init__.py b/code/bolsonaro/models/__init__.py
similarity index 100%
rename from bolsonaro/models/__init__.py
rename to code/bolsonaro/models/__init__.py
diff --git a/bolsonaro/models/model_factory.py b/code/bolsonaro/models/model_factory.py
similarity index 100%
rename from bolsonaro/models/model_factory.py
rename to code/bolsonaro/models/model_factory.py
diff --git a/bolsonaro/models/model_parameters.py b/code/bolsonaro/models/model_parameters.py
similarity index 100%
rename from bolsonaro/models/model_parameters.py
rename to code/bolsonaro/models/model_parameters.py
diff --git a/bolsonaro/models/omp_forest_classifier.py b/code/bolsonaro/models/omp_forest_classifier.py
similarity index 100%
rename from bolsonaro/models/omp_forest_classifier.py
rename to code/bolsonaro/models/omp_forest_classifier.py
diff --git a/bolsonaro/models/omp_forest_regressor.py b/code/bolsonaro/models/omp_forest_regressor.py
similarity index 100%
rename from bolsonaro/models/omp_forest_regressor.py
rename to code/bolsonaro/models/omp_forest_regressor.py
diff --git a/bolsonaro/trainer.py b/code/bolsonaro/trainer.py
similarity index 100%
rename from bolsonaro/trainer.py
rename to code/bolsonaro/trainer.py
diff --git a/bolsonaro/utils.py b/code/bolsonaro/utils.py
similarity index 100%
rename from bolsonaro/utils.py
rename to code/bolsonaro/utils.py
diff --git a/bolsonaro/visualization/.gitkeep b/code/bolsonaro/visualization/.gitkeep
similarity index 100%
rename from bolsonaro/visualization/.gitkeep
rename to code/bolsonaro/visualization/.gitkeep
diff --git a/bolsonaro/visualization/__init__.py b/code/bolsonaro/visualization/__init__.py
similarity index 100%
rename from bolsonaro/visualization/__init__.py
rename to code/bolsonaro/visualization/__init__.py
diff --git a/bolsonaro/visualization/plotter.py b/code/bolsonaro/visualization/plotter.py
similarity index 100%
rename from bolsonaro/visualization/plotter.py
rename to code/bolsonaro/visualization/plotter.py
diff --git a/bolsonaro/visualization/visualize.py b/code/bolsonaro/visualization/visualize.py
similarity index 100%
rename from bolsonaro/visualization/visualize.py
rename to code/bolsonaro/visualization/visualize.py
diff --git a/compute_results.py b/code/compute_results.py
similarity index 100%
rename from compute_results.py
rename to code/compute_results.py
diff --git a/train.py b/code/train.py
similarity index 100%
rename from train.py
rename to code/train.py
diff --git a/visualize.py b/code/visualize.py
similarity index 100%
rename from visualize.py
rename to code/visualize.py
diff --git a/requirements.txt b/requirements.txt
index d4f7d11..3b11a34 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,3 +8,4 @@ coverage
 awscli
 flake8
 python-dotenv>=0.5.1
+scikit-learn
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 08242fa..592074e 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,8 @@ from setuptools import find_packages, setup
 
 setup(
     name='bolsonaro',
-    packages=find_packages(),
+    packages=find_packages(where="code", exclude=['doc', 'dev']),
+    package_dir={'': "code"},
     version='0.1.0',
     description='Bolsonaro project of QARMA non-permanents: deforesting random forest using OMP.',
     author='QARMA team',
-- 
GitLab