Merge pull request #965 from ToFuProject/devel

Prepare 1.8.0

.github/workflows/test-complete-matrix.yml

@@ -13,11 +13,14 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        python-version: ['3.8', '3.9', '3.10']
+        os: [ubuntu-latest, windows-latest, macOS-latest] 
+        python-version: ['3.8', '3.9', '3.10', '3.11']
         include:
           - python-version: '3.7.11'
             os: ubuntu-20.04
+        exclude:
+          - python-version: ['3.11']
+            os: windows-latest
 
     steps:
     - uses: actions/checkout@v2

requirements.txt

@@ -10,6 +10,5 @@ svg.path
 Polygon3
 
 ######## Requirements with Version Specifier ########
-datastock>=0.0.39
-bsplines2d>=0.0.15
+spectrally>=0.0.4
 Cython>=0.26

setup.py

@@ -324,8 +324,7 @@ def get_version_tofu(path=_HERE):
         "svg.path",
         "Polygon3",
         "cython>=0.26",
-        "datastock>=0.0.39",
-        "bsplines2d>=0.0.15",
+        "spectrally>=0.0.4",
     ],
     python_requires=">=3.6",
 

tofu/data/_class00_Config.py

@@ -1,14 +1,8 @@
 # -*- coding: utf-8 -*-
 
 
-# Built-in
-import copy
-
-
 # Common
-import numpy as np
-import datastock as ds
-import bsplines2d as bs2
+import spectrally as sp
 
 
 # tofu
@@ -24,13 +18,13 @@
 # #############################################################################
 
 
-class Config(bs2.BSplines2D):
+class Config(sp.Collection):
 
     _show_in_summary = 'all'
-    _dshow = dict(bs2.BSplines2D._dshow)
+    _dshow = dict(sp.Collection._dshow)
     _dshow.update({
         'structure': [
         ],
         'config': [
         ],
-    })
+    })

tofu/data/_class08_Diagnostic.py

@@ -163,8 +163,8 @@ def get_diagnostic_data(
         default=None,
         print_full_doc=None,
         **kwdargs,
-        ):
-        """ Return dict of data for chosen cameras
+    ):
+        """ Return dict of built-in data for chosen cameras
 
         data can be:
             'etendue'
@@ -177,7 +177,7 @@ def get_diagnostic_data(
             'res'
 
         """
-        return _get_data._get_data(
+        return _get_data.main(
             coll=self,
             key=key,
             key_cam=key_cam,
@@ -200,7 +200,7 @@ def get_diagnostic_data_concatenated(
 
 
         """
-        return _concatenate._concatenate_data(
+        return _concatenate.main(
             coll=self,
             key=key,
             key_data=key_data,