Add packages, including namespace package antares

Signed-off-by: Sylvain Leclerc <[email protected]>

mypy.ini

@@ -3,3 +3,5 @@ mypy_path = src
 files = src
 disallow_untyped_defs = true
 disallow_untyped_calls = true
+namespace_packages = true
+explicit_package_bases = true

src/cluster_import.py → src/antares/tsgen/cluster_import.py

@@ -14,7 +14,7 @@
 
 import numpy as np
 
-from ts_generator import ProbabilityLaw, ThermalCluster
+from .ts_generator import ProbabilityLaw, ThermalCluster
 
 
 def import_thermal_cluster(path: Path, days_per_year: int = 365) -> ThermalCluster:

src/cluster_resolve.py → src/antares/tsgen/cluster_resolve.py

@@ -12,8 +12,8 @@
 
 import pandas as pd
 
-from cluster_parsing import InputCluster
-from ts_generator import ProbabilityLaw, ThermalCluster
+from .cluster_parsing import InputCluster
+from .ts_generator import ProbabilityLaw, ThermalCluster
 
 
 def resolve_thermal_cluster(

src/duration_generator.py → src/antares/tsgen/duration_generator.py

@@ -16,7 +16,7 @@
 
 import numpy as np
 
-from random_generator import RNG
+from .random_generator import RNG
 
 
 class ProbabilityLaw(Enum):

src/random_generator.py → src/antares/tsgen/random_generator.py

@@ -13,7 +13,7 @@
 from abc import ABC, abstractmethod
 from typing import Optional
 
-from mersenne_twister import MersenneTwister
+from .mersenne_twister import MersenneTwister
 
 
 class RNG(ABC):

src/ts_generator.py → src/antares/tsgen/ts_generator.py

@@ -14,10 +14,10 @@
 from typing import List
 
 import numpy as np
-import pandas as pd
+import numpy.typing as npt
 
-from duration_generator import ProbabilityLaw, make_duration_generator
-from random_generator import RNG, MersenneTwisterRNG
+from antares.tsgen.duration_generator import ProbabilityLaw, make_duration_generator
+from antares.tsgen.random_generator import RNG, MersenneTwisterRNG
 
 # probabilities above FAILURE_RATE_EQ_1 are considered certain (equal to 1)
 FAILURE_RATE_EQ_1 = 0.999

tests/conftest.py

@@ -14,7 +14,7 @@
 
 import pytest
 
-from random_generator import RNG, MersenneTwisterRNG
+from antares.tsgen.random_generator import RNG, MersenneTwisterRNG
 
 
 @pytest.fixture

tests/test.py

@@ -11,12 +11,11 @@
 # This file is part of the Antares project.
 
 import csv
-from pathlib import Path
 
 import pytest
 
-from cluster_import import import_thermal_cluster
-from ts_generator import ThermalCluster, ThermalDataGenerator
+from antares.tsgen.cluster_import import import_thermal_cluster
+from antares.tsgen.ts_generator import ThermalCluster, ThermalDataGenerator
 
 
 @pytest.fixture

tests/test_duration_generator.py

@@ -9,18 +9,17 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
-from unittest import expectedFailure
 
 import matplotlib.pyplot as plt
 import pytest
 
-from duration_generator import (
+from antares.tsgen.duration_generator import (
     GeometricDurationGenerator,
     ProbabilityLaw,
     UniformDurationGenerator,
     make_duration_generator,
 )
-from random_generator import MersenneTwisterRNG
+from antares.tsgen.random_generator import MersenneTwisterRNG
 
 
 @pytest.mark.parametrize(

tests/test_parsing.py

@@ -12,9 +12,9 @@
 
 import pytest
 
-from cluster_parsing import parse_cluster_ts, parse_yaml_cluster
-from cluster_resolve import resolve_thermal_cluster
-from ts_generator import ProbabilityLaw, ThermalCluster, ThermalDataGenerator
+from antares.tsgen.cluster_parsing import parse_cluster_ts, parse_yaml_cluster
+from antares.tsgen.cluster_resolve import resolve_thermal_cluster
+from antares.tsgen.ts_generator import ProbabilityLaw, ThermalCluster
 
 NB_OF_DAY = 10
 

tests/test_random_generator.py

@@ -11,7 +11,7 @@
 # This file is part of the Antares project.
 import random
 
-from random_generator import MersenneTwisterRNG, PythonRNG
+from antares.tsgen.random_generator import MersenneTwisterRNG, PythonRNG
 
 
 def test_python_rng():

tests/test_ts_generator.py

@@ -14,8 +14,8 @@
 
 import pytest
 
-from cluster_import import import_thermal_cluster
-from ts_generator import ThermalCluster, ThermalDataGenerator
+from antares.tsgen.cluster_import import import_thermal_cluster
+from antares.tsgen.ts_generator import ThermalCluster, ThermalDataGenerator
 
 
 @pytest.fixture

tests/test_unit.py

@@ -9,14 +9,15 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 # This file is part of the Antares project.
-import cProfile
-import random
-from pstats import SortKey
 
 import numpy as np
 import numpy.testing as npt
 
-from ts_generator import ProbabilityLaw, ThermalCluster, ThermalDataGenerator
+from antares.tsgen.ts_generator import (
+    ProbabilityLaw,
+    ThermalCluster,
+    ThermalDataGenerator,
+)
 
 
 def test_forced_outages(rng):