Merge branch 'main' into optionalise-variance-plotters

Author: KD-7

LICENSE

@@ -19,41 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
----
-
-Some of TrueLearn's functionality is derived from externally maintained libraries,
-including:
-
-- scikit-learn, licensed as follows:
-    """
-        BSD 3-Clause License
-
-        Copyright (c) 2007-2022 The scikit-learn developers.
-        All rights reserved.
-
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:
-
-        * Redistributions of source code must retain the above copyright notice, this
-        list of conditions and the following disclaimer.
-
-        * Redistributions in binary form must reproduce the above copyright notice,
-        this list of conditions and the following disclaimer in the documentation
-        and/or other materials provided with the distribution.
-
-        * Neither the name of the copyright holder nor the names of its
-        contributors may be used to endorse or promote products derived from
-        this software without specific prior written permission.
-
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-        FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-        CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-    """

LICENSE-3RD-PARTY

@@ -0,0 +1,35 @@
+Some of TrueLearn's functionality is derived from externally maintained libraries,
+including:
+
+- scikit-learn, licensed as follows:
+    """
+        BSD 3-Clause License
+
+        Copyright (c) 2007-2022 The scikit-learn developers.
+        All rights reserved.
+
+        Redistribution and use in source and binary forms, with or without
+        modification, are permitted provided that the following conditions are met:
+
+        * Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.
+
+        * Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.
+
+        * Neither the name of the copyright holder nor the names of its
+        contributors may be used to endorse or promote products derived from
+        this software without specific prior written permission.
+
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+        FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+        CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    """

pyproject.toml

@@ -51,18 +51,21 @@ dependencies = [
     'typing-extensions>=4.4.0',
     'trueskill>=0.4.5',
     'scikit-learn>=1.0.2',
-    'orjson>=3.8.6',
     'mpmath>=1.2.1',
-    'plotly>=5.14.1',
     'matplotlib>=3.5.3',
     'circlify>=0.15.0',
-    "wordcloud>=1.8.2.2; python_version < '3.11'",
+
+    # We lock these dependencies because our usage
+    # might be broken by their updates. We want to
+    # manually update these dependencies.
+    'plotly==5.14.1',
+    "wordcloud==1.9.2",
 
     # This is a temporary fix for kaleido hanging on image generation on Windows
     # See: https://github.com/plotly/Kaleido/issues/110
     # and: https://github.com/plotly/Kaleido/issues/134
     "kaleido==0.1.0.post1; sys_platform == 'win32'",
-    "kaleido>=0.2.1; sys_platform != 'win32'",
+    "kaleido==0.2.1; sys_platform != 'win32'",
 ]
 [project.urls]
 Homepage = "https://truelearnai.github.io/"

truelearn/preprocessing/_wikifier.py

@@ -1,7 +1,7 @@
 from typing import Optional, Union, Dict, List, Iterable, cast
 from urllib import parse, request
 
-import orjson
+import json
 
 from truelearn.errors import TrueLearnValueError, WikifierError
 
@@ -131,7 +131,7 @@ def __make_wikifier_request(
 
         # nosec because we know `url` is a valid https url
         with request.urlopen(url) as r:  # nosec
-            resp = orjson.loads(r.read().decode("utf-8"))
+            resp = json.loads(r.read().decode("utf-8"))
             if "error" in resp:
                 raise WikifierError(f"error in response : {resp['error']}")
             if "status" in resp:

truelearn/tests/test_utils_visualisations.py

@@ -4,7 +4,6 @@
 import pathlib
 import types
 import os
-import sys
 from typing import Dict, Optional, Callable
 
 import pytest
@@ -501,10 +500,6 @@ def test_top_n(self, resources):
         return plotter
 
 
-@pytest.mark.skipif(
-    sys.version_info >= (3, 11),
-    reason="WordPlotter only supports Python version < 3.11",
-)
 class TestWordPlotter:
     # no way to test this in a cross-platform way
     # because wordcloud renders the same font differently on different operating systems