Merge branch '1.2.x' into 2.0.x

BCG-X-Official · Apr 25, 2022 · 63a0ea5 · 63a0ea5
2 parents 283b86b + 14f53f6
commit 63a0ea5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/condabuild/meta.yaml b/condabuild/meta.yaml
@@ -45,6 +45,8 @@ test:
     - typing_inspect {{ environ.get('FACET_V_TYPING_INSPECT') }}
     # additional requirements of shap
     - ipython        {{ environ.get('FACET_V_IPYTHON') }}
+    # address incompatibility with Python 3.6
+    - typing_extensions {{ environ.get('FACET_V_TYPING_EXTENSIONS', '') }}
   commands:
     - conda list
     - python -c 'import facet;

diff --git a/pyproject.toml b/pyproject.toml
@@ -88,6 +88,8 @@ joblib         = "~=0.14.1"
 typing_inspect = "~=0.4.0"
 # additional minimum requirements of shap
 ipython        = "==7.0"
+# address incompatibility with Python 3.6
+typing-extensions = "<4.2"
 
 [build.matrix.max]
 # direct requirements of gamma-facet