Move types to models

It creates a problem with Python 3.8 on docker as "types" package name
clashes with python "types"

integration/test_unittest.py

@@ -12,7 +12,7 @@
 from npf.test import Test
 from npf.build import Build
 from npf.variable import RangeVariable, SimpleVariable, dtype, numeric_dict
-from npf.types.dataset import Run
+from npf.models.dataset import Run
 
 import numpy as np
 import logging

npf/build.py

@@ -5,7 +5,7 @@
 from pathlib import Path
 import re
 from npf import variable, npf
-from npf.types.dataset import Run, Dataset
+from npf.models.dataset import Run, Dataset
 import copy
 
 renametable = {

npf/expdesign/zltexp.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 from npf.expdesign.fullexp import FullVariableExpander
-from npf.types.dataset import Run
+from npf.models.dataset import Run
 from npf.variable import Variable
 
 class OptVariableExpander(FullVariableExpander):

npf/graph.py

@@ -1,4 +1,4 @@
-from npf.types.dataset import convert_to_xyeb
+from npf.models.dataset import convert_to_xyeb
 from npf.variable import is_numeric, get_numeric
 import numpy as np
 

npf/grapher.py

@@ -6,9 +6,9 @@
 import traceback
 import sys
 
-from npf.types.notebook.notebook import prepare_notebook_export
+from npf.models.notebook.notebook import prepare_notebook_export
 
-from npf.types.web.web import prepare_web_export
+from npf.models.web.web import prepare_web_export
 if sys.version_info < (3, 7):
     from orderedset import OrderedSet
 else:
@@ -23,9 +23,9 @@
 from pygtrie import Trie
 from math import log,pow
 
-from npf.types import dataset
-from npf.types.series import Series
-from npf.types.dataset import Run, XYEB, AllXYEB, group_val, var_divider, mask_from_filter
+from npf.models import dataset
+from npf.models.series import Series
+from npf.models.dataset import Run, XYEB, AllXYEB, group_val, var_divider, mask_from_filter
 from npf.variable import is_log, is_numeric, get_numeric, numericable, get_bool, is_bool
 from npf.section import SectionVariable
 from npf.build import Build

npf/types/dataset.py → npf/models/dataset.py

@@ -14,7 +14,7 @@
 from npf import npf
 from npf.variable import is_numeric, get_numeric, numeric_dict
 
-from npf.types.web.web import prepare_web_export
+from npf.models.web.web import prepare_web_export
 
 class Run:
     def __init__(self, variables):

npf/pipeline/pypost.py

@@ -3,7 +3,7 @@
 
 from typing import List
 
-from npf.types.series import Series
+from npf.models.series import Series
 
 
 def execute_pypost(series: List[Series]):

npf/regression.py

@@ -3,7 +3,7 @@
 from npf.grapher import *
 from npf.repository import *
 from npf.test import Test, SectionScript, ScriptInitException
-from npf.types.dataset import Dataset
+from npf.models.dataset import Dataset
 
 
 """Handles regression tests. That is, given an history of versions, execute tests for all previous versions

npf/statistics.py

@@ -15,7 +15,7 @@
 
 from npf.build import Build
 from npf.test import Test
-from npf.types.dataset import Dataset
+from npf.models.dataset import Dataset
 from npf import npf
 
 class Statistics:

npf/test.py

@@ -18,7 +18,7 @@
 from npf.section import *
 from npf.npf import get_valid_filename
 from npf.sections import Section, SectionNull
-from npf.types.dataset import Run, Dataset
+from npf.models.dataset import Run, Dataset
 from npf.eventbus import EventBus
 from .variable import get_bool
 from decimal import *

npf/test_driver.py

@@ -6,8 +6,8 @@
 from npf.repository import Repository
 from npf.statistics import Statistics
 from npf.test import Test
-from npf.types.dataset import Dataset, Run
-from npf.types.series import Series
+from npf.models.dataset import Dataset, Run
+from npf.models.series import Series
 
 
 """Runs all tests for a given list of tests (or a folder to expand), and a series of repositories.

npf_compare.py

@@ -20,7 +20,7 @@
 
 from npf import npf
 
-from npf.types.series import Series
+from npf.models.series import Series
 
 from npf.test_driver import group_series