From bd4dfb05257841962f7a454f416f30d071f7621a Mon Sep 17 00:00:00 2001 From: Oriol Abril-Pla Date: Fri, 20 Jan 2023 13:28:46 +0100 Subject: [PATCH] Fix xarray dependency lower bound (#45) * Fix xarray dependency lower bound * prepare patch release --- docs/source/changelog.md | 7 +- docs/source/contributing/how_to.md | 2 + docs/source/tutorials/linalg_tutorial.ipynb | 90 ++++---- .../tutorials/np_linalg_tutorial_port.ipynb | 69 +++--- docs/source/tutorials/stats_tutorial.ipynb | 200 +++++++++--------- pyproject.toml | 2 +- src/xarray_einstats/__init__.py | 2 +- 7 files changed, 181 insertions(+), 191 deletions(-) diff --git a/docs/source/changelog.md b/docs/source/changelog.md index 85ee0d3..4be40ae 100644 --- a/docs/source/changelog.md +++ b/docs/source/changelog.md @@ -1,11 +1,8 @@ # Change Log -## v0.x.x (Unreleased) -### New features - +## v0.5.1 (2023 Jan 20) ### Maintenance and fixes - -### Documentation +* Fix lower cap on xarray version dependency {pull}`45` ## v0.5.0 (2023 Jan 16) ### New features diff --git a/docs/source/contributing/how_to.md b/docs/source/contributing/how_to.md index b8ec6eb..9747a8b 100644 --- a/docs/source/contributing/how_to.md +++ b/docs/source/contributing/how_to.md @@ -61,4 +61,6 @@ on an environment that has a specific set of dependencies installed. ### Documentation ``` +1. Check conda-forge. It will automatically send a PR with the updated recipe which + will need to be reviewed (and modified if dependencies were updated). diff --git a/docs/source/tutorials/linalg_tutorial.ipynb b/docs/source/tutorials/linalg_tutorial.ipynb index b0ef4f3..95c3bb8 100644 --- a/docs/source/tutorials/linalg_tutorial.ipynb +++ b/docs/source/tutorials/linalg_tutorial.ipynb @@ -403,7 +403,7 @@ "}\n", "
<xarray.DataArray (batch: 10, experiment: 3, dim: 4, dim2: 4)>\n",
        "0.7075 1.025 0.5685 0.8951 0.2065 3.384 ... 1.239 0.4527 0.5749 0.4766 0.859\n",
-       "Dimensions without coordinates: batch, experiment, dim, dim2
        • " ], "text/plain": [ "\n", @@ -847,7 +847,7 @@ "}\n", "
        <xarray.DataArray (batch: 10, experiment: 3)>\n",
        "4.854 4.74 4.457 2.637 2.79 3.163 1.998 ... 2.804 4.58 2.888 4.936 5.983 4.07\n",
-       "Dimensions without coordinates: batch, experiment
            • " ], "text/plain": [ "\n", @@ -1255,7 +1255,7 @@ "}\n", "
            <xarray.DataArray (batch: 10, experiment: 3, dim: 4, dim2: 4)>\n",
        "11.26 -2.363 -10.84 -0.2744 10.99 -2.017 ... -3.444 0.7703 0.316 0.01949 -1.162\n",
-       "Dimensions without coordinates: batch, experiment, dim, dim2
                • " ], "text/plain": [ "\n", @@ -1704,7 +1704,7 @@ "}\n", "
                <xarray.DataArray (batch: 10, experiment: 3, dim: 4, dim2: 4)>\n",
        "-0.5452 0.01652 -0.5624 -0.6214 -0.1592 ... -0.3322 -0.4013 0.2607 0.8128\n",
-       "Dimensions without coordinates: batch, experiment, dim, dim2
                    • " ], "text/plain": [ "\n", @@ -2135,7 +2135,7 @@ "}\n", "
                    <xarray.DataArray (batch: 10, experiment: 3, dim: 4, dim2: 4)>\n",
        "-1.298 -1.975 -1.858 -1.228 0.0 -3.137 ... -0.4307 1.052 0.0 0.0 0.0 -0.6995\n",
-       "Dimensions without coordinates: batch, experiment, dim, dim2
                        • " ], "text/plain": [ "\n", @@ -2612,7 +2612,7 @@ "}\n", "
                        <xarray.DataArray (batch: 10, experiment: 3, dim: 4, dim2: 4)>\n",
        "1.845 5.326 2.407 3.89 3.378 14.68 5.449 ... 5.586 6.55 1.279 1.373 1.791 2.658\n",
-       "Dimensions without coordinates: batch, experiment, dim, dim2
                            • " ], "text/plain": [ "\n", @@ -3063,7 +3063,7 @@ "}\n", "
                            <xarray.DataArray (dim: 4, dim2_bis: 4, batch_bis: 10, batch: 10, dim2: 4)>\n",
        "10.79 3.926 1.503 3.986 0.1886 0.1844 ... 1.289 4.187 5.251 3.372 2.81 13.1\n",
-       "Dimensions without coordinates: dim, dim2_bis, batch_bis, batch, dim2
                                • " ], "text/plain": [ "\n", @@ -3505,7 +3505,7 @@ "}\n", "
                                <xarray.DataArray (dim: 4, dim2: 4, batch: 10, batch2: 10)>\n",
        "10.79 0.1886 5.402 1.471 1.243 5.348 2.639 ... 3.462 3.618 11.21 9.47 4.187 13.1\n",
-       "Dimensions without coordinates: dim, dim2, batch, batch2
                                    • " ], "text/plain": [ "\n", @@ -3947,7 +3947,7 @@ "}\n", "
                                    <xarray.DataArray (batch: 10, experiment: 3, different_dim: 4, different_dim2: 4)>\n",
        "0.7075 1.025 0.5685 0.8951 0.2065 3.384 ... 1.239 0.4527 0.5749 0.4766 0.859\n",
-       "Dimensions without coordinates: batch, experiment, different_dim, different_dim2
                                        • " ], "text/plain": [ "\n", @@ -4387,7 +4387,7 @@ "}\n", "
                                        <xarray.DataArray (batch: 10, experiment: 3, dim: 4, different_dim2: 4)>\n",
        "1.845 5.326 2.407 3.89 3.378 14.68 5.449 ... 5.586 6.55 1.279 1.373 1.791 2.658\n",
-       "Dimensions without coordinates: batch, experiment, dim, different_dim2
                                            • " ], "text/plain": [ "\n", @@ -4826,7 +4826,7 @@ "}\n", "
                                            <xarray.DataArray (dim: 4, dim2: 4, experiment: 3, experiment2: 3)>\n",
        "9.727 6.68 3.595 6.68 18.66 6.065 3.595 ... 10.81 36.08 8.181 3.233 8.181 14.77\n",
-       "Dimensions without coordinates: dim, dim2, experiment, experiment2
                                                • " ], "text/plain": [ "\n", @@ -5292,7 +5292,7 @@ "}\n", "
                                                <xarray.DataArray (batch: 10, dim: 4, dim2: 4)>\n",
        "4.487 3.158 0.9252 2.683 0.5319 3.799 ... 3.387 1.796 2.601 2.455 1.538 5.402\n",
-       "Dimensions without coordinates: batch, dim, dim2
                                                    • " ], "text/plain": [ "\n", @@ -5732,10 +5732,10 @@ "}\n", "
                                                    <xarray.DataArray (dim: 4, dim2: 4)>\n",
        "22.27 32.55 29.06 40.96 23.96 33.48 ... 25.27 29.59 34.97 20.57 34.89 30.26\n",
-       "Dimensions without coordinates: dim, dim2
                                                        • " ], "text/plain": [ "\n", @@ -6148,7 +6148,7 @@ "}\n", "
                                                        <xarray.DataArray (batch: 10, dim: 4, dim2: 4)>\n",
        "10.79 3.543 0.4447 2.399 0.111 11.58 10.95 ... 5.104 1.799 2.513 3.052 0.79 13.1\n",
-       "Dimensions without coordinates: batch, dim, dim2
                                                            • " ], "text/plain": [ "\n", @@ -6602,7 +6602,7 @@ "}\n", "
                                                            <xarray.DataArray (dim: 4, dim2: 4, batch: 10, experiment: 3)>\n",
        "33.15 44.26 22.52 1.318 1.76 0.8951 ... 19.52 36.93 18.42 42.62 80.64 40.23\n",
-       "Dimensions without coordinates: dim, dim2, batch, experiment
                                                                • " ], "text/plain": [ "\n", @@ -7060,10 +7060,10 @@ "}\n", "
                                                                <xarray.DataArray (dim: 4, dim2: 4)>\n",
        "496.0 1.06e+03 844.2 1.678e+03 573.9 ... 875.4 1.223e+03 423.1 1.218e+03 915.8\n",
-       "Dimensions without coordinates: dim, dim2
                                                                    • " ], "text/plain": [ "\n", @@ -7481,10 +7481,10 @@ "}\n", "
                                                                    <xarray.DataArray (dim: 4, dim2: 4)>\n",
        "32.03 68.57 42.6 101.0 40.06 76.88 59.44 ... 33.78 83.88 72.41 32.43 76.33 60.63\n",
-       "Dimensions without coordinates: dim, dim2
                                                                        • " ], "text/plain": [ "\n", @@ -7883,10 +7883,10 @@ "}\n", "
                                                                        <xarray.DataArray (dim: 4, dim2: 4)>\n",
        "32.03 68.57 42.6 101.0 40.06 76.88 59.44 ... 33.78 83.88 72.41 32.43 76.33 60.63\n",
-       "Dimensions without coordinates: dim, dim2
                                                                            • " ], "text/plain": [ "\n", @@ -8301,7 +8301,7 @@ "}\n", "
                                                                            <xarray.DataArray (batch: 10, experiment: 3, dim: 4)>\n",
        "2.676 19.38 0.8116 5.562 11.33 2.104 ... 6.259 12.24 6.737 0.5945 7.355 1.5\n",
-       "Dimensions without coordinates: batch, experiment, dim
                                                                                • " ], "text/plain": [ "\n", @@ -8739,7 +8739,7 @@ "}\n", "
                                                                                <xarray.DataArray (batch: 10, experiment: 3, dim: 4, dim_auto2: 4)>\n",
        "2.676 6.135 1.302 3.007 6.135 19.38 2.018 ... 7.355 2.884 2.942 0.8866 2.884 1.5\n",
-       "Dimensions without coordinates: batch, experiment, dim, dim_auto2
                                                                                    • " ], "text/plain": [ "\n", @@ -9185,7 +9185,7 @@ "}\n", "
                                                                                    <xarray.DataArray (experiment: 3, dim: 4, dim2: 4, batch: 10, batch2: 10)>\n",
        "0.5006 0.09001 0.1315 0.3874 0.5949 0.6645 ... 2.931 0.2908 0.5802 0.4342 0.7379\n",
-       "Dimensions without coordinates: experiment, dim, dim2, batch, batch2
                                                                                        • " ], "text/plain": [ "\n", @@ -9252,16 +9252,16 @@ "name": "stdout", "output_type": "stream", "text": [ - "Last updated: Mon Jan 16 2023\n", + "Last updated: Fri Jan 20 2023\n", "\n", "Python implementation: CPython\n", "Python version : 3.10.8\n", - "IPython version : 8.7.0\n", + "IPython version : 8.8.0\n", "\n", "numpy: 1.24.0\n", "\n", + "xarray_einstats: 0.5.1\n", "xarray : 2022.12.0\n", - "xarray_einstats: 0.5.0\n", "\n", "Watermark: 2.3.1\n", "\n" diff --git a/docs/source/tutorials/np_linalg_tutorial_port.ipynb b/docs/source/tutorials/np_linalg_tutorial_port.ipynb index 01fa3ad..252d562 100644 --- a/docs/source/tutorials/np_linalg_tutorial_port.ipynb +++ b/docs/source/tutorials/np_linalg_tutorial_port.ipynb @@ -37,23 +37,14 @@ "execution_count": 1, "id": "aa532079", "metadata": {}, - "outputs": [ - { - "name": "stderr", - "output_type": "stream", - "text": [ - "/tmp/ipykernel_39843/849063265.py:6: DeprecationWarning: scipy.misc.face has been deprecated in SciPy v1.10.0; and will be completely removed in SciPy v1.12.0. Dataset methods have moved into the scipy.datasets module. Use scipy.datasets.face instead.\n", - " img = xr.DataArray(misc.face(), dims=[\"height\", \"width\", \"color\"], coords={\"color\": [\"R\", \"G\", \"B\"]})\n" - ] - } - ], + "outputs": [], "source": [ - "from scipy import misc\n", + "from scipy import datasets\n", "import xarray as xr\n", "\n", "xr.set_options(display_expand_data=False)\n", "\n", - "img = xr.DataArray(misc.face(), dims=[\"height\", \"width\", \"color\"], coords={\"color\": [\"R\", \"G\", \"B\"]})" + "img = xr.DataArray(datasets.face(), dims=[\"height\", \"width\", \"color\"], coords={\"color\": [\"R\", \"G\", \"B\"]})" ] }, { @@ -556,7 +547,7 @@ "121 112 131 138 129 148 153 144 165 155 ... 98 120 156 95 119 155 93 118 154 92\n", "Coordinates:\n", " * color (color) <U1 'R' 'G' 'B'\n", - "Dimensions without coordinates: height, width
                                                                                        • color
                                                                                          (color)
                                                                                          <U1
                                                                                          'R' 'G' 'B'
                                                                                          array(['R', 'G', 'B'], dtype='<U1')
                                                                                        • color
                                                                                          PandasIndex
                                                                                          PandasIndex(Index(['R', 'G', 'B'], dtype='object', name='color'))
                                                                                        • " ], "text/plain": [ "\n", @@ -1004,13 +995,13 @@ "121 138 153 155 155 158 159 156 147 137 ... 113 116 117 120 121 121 120 119 118\n", "Coordinates:\n", " color <U1 'R'\n", - "Dimensions without coordinates: height, width
                                                                                        • color
                                                                                          ()
                                                                                          <U1
                                                                                          'R'
                                                                                          array('R', dtype='<U1')
                                                                                          • " ], "text/plain": [ "\n", @@ -1562,7 +1553,7 @@ "}\n", "
                                                                                          <xarray.DataArray (height: 768, width: 1024)>\n",
        "0.4521 0.5188 0.5782 0.586 0.586 0.5955 ... 0.5667 0.5662 0.5645 0.5603 0.5564\n",
-       "Dimensions without coordinates: height, width
                                                                                              • " ], "text/plain": [ "\n", @@ -2032,7 +2023,7 @@ "}\n", "
                                                                                              <xarray.DataArray (height: 768, height2: 768)>\n",
        "0.03181 0.01899 0.01773 0.00738 0.01887 ... 0.03089 0.005258 0.0146 0.004079\n",
-       "Dimensions without coordinates: height, height2
                                                                                                  • " ], "text/plain": [ "\n", @@ -2435,7 +2426,7 @@ "}\n", "
                                                                                                  <xarray.DataArray (height: 768)>\n",
        "410.4 85.56 63.61 45.85 41.97 38.26 ... 0.01117 0.01085 0.01079 0.01032 0.009925\n",
-       "Dimensions without coordinates: height
                                                                                                      • " ], "text/plain": [ "\n", @@ -2866,7 +2857,7 @@ "}\n", "
                                                                                                      <xarray.DataArray (width: 1024, width2: 1024)>\n",
        "0.03587 0.03582 0.03581 0.03574 0.03553 ... 0.03706 0.0731 -0.2073 0.1374\n",
-       "Dimensions without coordinates: width, width2
                                                                                                          • " ], "text/plain": [ "\n", @@ -3294,7 +3285,7 @@ "}\n", "
                                                                                                          <xarray.DataArray (height: 768, width: 1024)>\n",
        "410.4 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 ... 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0\n",
-       "Dimensions without coordinates: height, width
                                                                                                              • " ], "text/plain": [ "\n", @@ -3714,7 +3705,7 @@ " fill: currentColor;\n", "}\n", "
                                                                                                              <xarray.DataArray ()>\n",
-       "1.429e-12
                                                                                                              " + "1.429e-12" ], "text/plain": [ "\n", @@ -4192,7 +4183,7 @@ "}\n", "
                                                                                                              <xarray.DataArray (height: 768, width: 10)>\n",
        "410.4 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 ... 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0\n",
-       "Dimensions without coordinates: height, width
                                                                                                                  • " ], "text/plain": [ "\n", @@ -4595,7 +4586,7 @@ "}\n", "
                                                                                                                  <xarray.DataArray (width: 10, width2: 1024)>\n",
        "0.03587 0.03582 0.03581 0.03574 0.03553 ... -0.07889 -0.07779 -0.07644 -0.07542\n",
-       "Dimensions without coordinates: width, width2
                                                                                                                      • " ], "text/plain": [ "\n", @@ -5124,7 +5115,7 @@ "0.4745 0.5412 0.6 0.6078 0.6078 0.6196 ... 0.3922 0.3843 0.3725 0.3647 0.3608\n", "Coordinates:\n", " * color (color) <U1 'R' 'G' 'B'\n", - "Dimensions without coordinates: height, width
                                                                                                                      • color
                                                                                                                        (color)
                                                                                                                        <U1
                                                                                                                        'R' 'G' 'B'
                                                                                                                        array(['R', 'G', 'B'], dtype='<U1')
                                                                                                                      • color
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Index(['R', 'G', 'B'], dtype='object', name='color'))
                                                                                                                      • " ], "text/plain": [ "\n", @@ -5661,7 +5652,7 @@ "0.4745 0.4822 0.4893 0.492 0.4967 0.5061 ... 0.2838 0.2866 0.2899 0.2925 0.2938\n", "Coordinates:\n", " * color (color) <U1 'R' 'G' 'B'\n", - "Dimensions without coordinates: height, width
                                                                                                                      • color
                                                                                                                        (color)
                                                                                                                        <U1
                                                                                                                        'R' 'G' 'B'
                                                                                                                        array(['R', 'G', 'B'], dtype='<U1')
                                                                                                                      • color
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Index(['R', 'G', 'B'], dtype='object', name='color'))
                                                                                                                      • " ], "text/plain": [ "\n", @@ -5787,16 +5778,16 @@ "name": "stdout", "output_type": "stream", "text": [ - "Last updated: Mon Jan 16 2023\n", + "Last updated: Fri Jan 20 2023\n", "\n", "Python implementation: CPython\n", "Python version : 3.10.8\n", - "IPython version : 8.7.0\n", + "IPython version : 8.8.0\n", "\n", - "xarray_einstats: 0.5.0\n", + "scipy : 1.10.0\n", + "xarray_einstats: 0.5.1\n", "numpy : 1.24.0\n", "matplotlib : 3.6.2\n", - "scipy : 1.10.0\n", "xarray : 2022.12.0\n", "\n", "Watermark: 2.3.1\n", diff --git a/docs/source/tutorials/stats_tutorial.ipynb b/docs/source/tutorials/stats_tutorial.ipynb index daac143..eed0924 100644 --- a/docs/source/tutorials/stats_tutorial.ipynb +++ b/docs/source/tutorials/stats_tutorial.ipynb @@ -439,56 +439,56 @@ " fill: currentColor;\n", "}\n", "
                                                                                                                      <xarray.DataArray (rv_dim0: 10, chain: 4, draw: 10, team: 6)>\n",
-       "0.6418 0.4174 1.425 0.05737 0.5546 4.485 ... 0.1927 -0.3864 0.2633 0.3151 1.68\n",
+       "0.7642 0.4343 0.6968 -0.027 0.4267 ... -0.0007421 0.6107 0.379 0.3461 2.008\n",
        "Coordinates:\n",
        "  * team     (team) <U1 'a' 'b' 'c' 'd' 'e' 'f'\n",
        "  * chain    (chain) int64 0 1 2 3\n",
        "  * draw     (draw) int64 0 1 2 3 4 5 6 7 8 9\n",
-       "Dimensions without coordinates: rv_dim0
                                                                                                                      • team
                                                                                                                        (team)
                                                                                                                        <U1
                                                                                                                        'a' 'b' 'c' 'd' 'e' 'f'
                                                                                                                        array(['a', 'b', 'c', 'd', 'e', 'f'], dtype='<U1')
                                                                                                                      • chain
                                                                                                                        (chain)
                                                                                                                        int64
                                                                                                                        0 1 2 3
                                                                                                                        array([0, 1, 2, 3])
                                                                                                                      • draw
                                                                                                                        (draw)
                                                                                                                        int64
                                                                                                                        0 1 2 3 4 5 6 7 8 9
                                                                                                                        array([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
                                                                                                                      • team
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Index(['a', 'b', 'c', 'd', 'e', 'f'], dtype='object', name='team'))
                                                                                                                      • chain
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Int64Index([0, 1, 2, 3], dtype='int64', name='chain'))
                                                                                                                      • draw
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Int64Index([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], dtype='int64', name='draw'))
                                                                                                                      • " ], "text/plain": [ "\n", - "0.6418 0.4174 1.425 0.05737 0.5546 4.485 ... 0.1927 -0.3864 0.2633 0.3151 1.68\n", + "0.7642 0.4343 0.6968 -0.027 0.4267 ... -0.0007421 0.6107 0.379 0.3461 2.008\n", "Coordinates:\n", " * team (team) 
                                                                                                                      <xarray.DataArray (subject: 5, batch: 3, chain: 4, draw: 10, team: 6)>\n",
-       "0.2426 0.2904 0.6682 -0.1603 0.02198 ... -0.102 -0.08568 0.4546 0.2521 1.719\n",
+       "0.7812 1.211 1.219 0.2005 0.3553 3.481 ... 0.1891 0.2702 0.1967 0.329 1.79\n",
        "Coordinates:\n",
        "  * team     (team) <U1 'a' 'b' 'c' 'd' 'e' 'f'\n",
        "  * chain    (chain) int64 0 1 2 3\n",
        "  * draw     (draw) int64 0 1 2 3 4 5 6 7 8 9\n",
-       "Dimensions without coordinates: subject, batch
                                                                                                                      • team
                                                                                                                        (team)
                                                                                                                        <U1
                                                                                                                        'a' 'b' 'c' 'd' 'e' 'f'
                                                                                                                        array(['a', 'b', 'c', 'd', 'e', 'f'], dtype='<U1')
                                                                                                                      • chain
                                                                                                                        (chain)
                                                                                                                        int64
                                                                                                                        0 1 2 3
                                                                                                                        array([0, 1, 2, 3])
                                                                                                                      • draw
                                                                                                                        (draw)
                                                                                                                        int64
                                                                                                                        0 1 2 3 4 5 6 7 8 9
                                                                                                                        array([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
                                                                                                                      • team
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Index(['a', 'b', 'c', 'd', 'e', 'f'], dtype='object', name='team'))
                                                                                                                      • chain
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Int64Index([0, 1, 2, 3], dtype='int64', name='chain'))
                                                                                                                      • draw
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Int64Index([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], dtype='int64', name='draw'))
                                                                                                                      • " ], "text/plain": [ "\n", - "0.2426 0.2904 0.6682 -0.1603 0.02198 ... -0.102 -0.08568 0.4546 0.2521 1.719\n", + "0.7812 1.211 1.219 0.2005 0.3553 3.481 ... 0.1891 0.2702 0.1967 0.329 1.79\n", "Coordinates:\n", " * team (team)
                                                                                                                      • chain
                                                                                                                        (chain)
                                                                                                                        int64
                                                                                                                        0 1 2 3
                                                                                                                        array([0, 1, 2, 3])
                                                                                                                      • draw
                                                                                                                        (draw)
                                                                                                                        int64
                                                                                                                        0 1 2 3 4 5 6 7 8 9
                                                                                                                        array([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
                                                                                                                      • team
                                                                                                                        (team)
                                                                                                                        <U1
                                                                                                                        'a' 'b' 'c' 'd' 'e' 'f'
                                                                                                                        array(['a', 'b', 'c', 'd', 'e', 'f'], dtype='<U1')
                                                                                                                      • chain
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Int64Index([0, 1, 2, 3], dtype='int64', name='chain'))
                                                                                                                      • draw
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Int64Index([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], dtype='int64', name='draw'))
                                                                                                                      • team
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Index(['a', 'b', 'c', 'd', 'e', 'f'], dtype='object', name='team'))
                                                                                                                      • " ], "text/plain": [ "\n", @@ -1785,7 +1785,7 @@ " * quantile (quantile) float64 0.25 0.5 0.75\n", " * chain (chain) int64 0 1 2 3\n", " * draw (draw) int64 0 1 2 3 4 5 6 7 8 9\n", - " * team (team) <U1 'a' 'b' 'c' 'd' 'e' 'f'
                                                                                                                      • quantile
                                                                                                                        (quantile)
                                                                                                                        float64
                                                                                                                        0.25 0.5 0.75
                                                                                                                        array([0.25, 0.5 , 0.75])
                                                                                                                      • chain
                                                                                                                        (chain)
                                                                                                                        int64
                                                                                                                        0 1 2 3
                                                                                                                        array([0, 1, 2, 3])
                                                                                                                      • draw
                                                                                                                        (draw)
                                                                                                                        int64
                                                                                                                        0 1 2 3 4 5 6 7 8 9
                                                                                                                        array([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
                                                                                                                      • team
                                                                                                                        (team)
                                                                                                                        <U1
                                                                                                                        'a' 'b' 'c' 'd' 'e' 'f'
                                                                                                                        array(['a', 'b', 'c', 'd', 'e', 'f'], dtype='<U1')
                                                                                                                      • quantile
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Float64Index([0.25, 0.5, 0.75], dtype='float64', name='quantile'))
                                                                                                                      • chain
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Int64Index([0, 1, 2, 3], dtype='int64', name='chain'))
                                                                                                                      • draw
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Int64Index([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], dtype='int64', name='draw'))
                                                                                                                      • team
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Index(['a', 'b', 'c', 'd', 'e', 'f'], dtype='object', name='team'))
                                                                                                                      • " ], "text/plain": [ "\n", @@ -2224,7 +2224,7 @@ " * point (point) float64 -5.0 -4.796 -4.592 -4.388 ... 4.388 4.592 4.796 5.0\n", " * chain (chain) int64 0 1 2 3\n", " * draw (draw) int64 0 1 2 3 4 5 6 7 8 9\n", - " * team (team) <U1 'a' 'b' 'c' 'd' 'e' 'f'
                                                                                                                      • " ], "text/plain": [ "\n", @@ -2737,14 +2737,14 @@ "0.1588 0.2123 0.5543 0.7826 0.1913 0.6035 ... 0.1269 0.712 0.3044 0.1936 0.1223\n", "Coordinates:\n", " * chain (chain) int64 0 1 2 3\n", - " * draw (draw) int64 0 1 2 3 4 5 6 7 8 9
                                                                                                                      • chain
                                                                                                                        (chain)
                                                                                                                        int64
                                                                                                                        0 1 2 3
                                                                                                                        array([0, 1, 2, 3])
                                                                                                                      • draw
                                                                                                                        (draw)
                                                                                                                        int64
                                                                                                                        0 1 2 3 4 5 6 7 8 9
                                                                                                                        array([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
                                                                                                                      • chain
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Int64Index([0, 1, 2, 3], dtype='int64', name='chain'))
                                                                                                                      • draw
                                                                                                                        PandasIndex
                                                                                                                        PandasIndex(Int64Index([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], dtype='int64', name='draw'))
                                                                                                                      • " ], "text/plain": [ "\n", @@ -3137,7 +3137,7 @@ "}\n", "
                                                                                                                      <xarray.DataArray 'score' (match: 12, chain: 4, draw: 10)>\n",
        "14 14 14 14 14 31 14 1 31 14 31 1 14 1 ... 15 15 15 15 15 1 34 15 15 1 34 34 34\n",
-       "Dimensions without coordinates: match, chain, draw
                                                                                                                          • " ], "text/plain": [ "\n", @@ -3588,10 +3588,10 @@ "Data variables:\n", " score (match) float64 1.466 0.2149 0.6788 1.361 ... 1.099 1.156 1.265\n", " mu (team) float64 0.8152 1.84 2.102 1.806 1.091 0.9678\n", - " sigma float64 1.314
                                                                                                                          • team
                                                                                                                            PandasIndex
                                                                                                                            PandasIndex(Index(['a', 'b', 'c', 'd', 'e', 'f'], dtype='object', name='team'))
                                                                                                                          • " ], "text/plain": [ "\n", @@ -3992,7 +3992,7 @@ " x_plot float64 2.632\n", " mu float64 0.4878\n", " sigma float64 0.39\n", - " score float64 1.0" + " score float64 1.0" ], "text/plain": [ "\n", @@ -4023,18 +4023,18 @@ "name": "stdout", "output_type": "stream", "text": [ - "Last updated: Mon Jan 16 2023\n", + "Last updated: Fri Jan 20 2023\n", "\n", "Python implementation: CPython\n", "Python version : 3.10.8\n", - "IPython version : 8.7.0\n", + "IPython version : 8.8.0\n", "\n", - "xarray_einstats: 0.5.0\n", + "xarray_einstats: 0.5.1\n", "xarray : 2022.12.0\n", "\n", - "numpy : 1.24.0\n", "matplotlib: 3.6.2\n", "scipy : 1.10.0\n", + "numpy : 1.24.0\n", "\n", "Watermark: 2.3.1\n", "\n" diff --git a/pyproject.toml b/pyproject.toml index 6d3011b..352e070 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ dynamic = ["version"] dependencies = [ "numpy>=1.20", "scipy>=1.6", - "xarray>=0.16", + "xarray>=2022.09.0", ] [tool.flit.module] diff --git a/src/xarray_einstats/__init__.py b/src/xarray_einstats/__init__.py index 0001f64..f708f44 100644 --- a/src/xarray_einstats/__init__.py +++ b/src/xarray_einstats/__init__.py @@ -9,7 +9,7 @@ __all__ = ["einsum", "raw_einsum", "einsum_path", "matmul", "zeros_ref", "ones_ref", "empty_ref"] -__version__ = "0.6.0.dev0" +__version__ = "0.5.1" def sort(da, dim, **kwargs):