Merge branch '1.1.x' into 1.2.x

# Conflicts: # src/facet/__init__.py
BCG-X-Official · Feb 23, 2022 · b68d1d2 · b68d1d2
2 parents c3b8124 + f546789
commit b68d1d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/condabuild/meta.yaml b/condabuild/meta.yaml
@@ -12,7 +12,7 @@ build:
 requirements:
   host:
     - flit>=3.0.*
-    - numpy {{ environ.get('FACET_V_NUMPY', '>=1.11') }}
+    - numpy           {{ environ.get('FACET_V_NUMPY', '>=1.11') }}
     - pip>=20
     - python=3.8
   run:

diff --git a/src/facet/__init__.py b/src/facet/__init__.py
@@ -6,7 +6,7 @@
 """
 
 
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 
 __logo__ = (
     r"""
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
     """
-    __version__ = "1.2.2"
+    __version__ = "1.2.3"
     __logo__ = (
         r"""
@@ Expand Down @@