build: upgrade to expertsystem v0.7.0 (#228)

* ci: avoid pip-tools v6.0.0 * ci: upgrade developer dependencies (automatic) * fix: allow numba in get_backend_modules
ComPWA · Mar 15, 2021 · f9c955e · f9c955e
1 parent ad3e5bd
commit f9c955e
Show file tree

Hide file tree

Showing 25 changed files with 104 additions and 103 deletions.
diff --git a/.github/workflows/requirements-cron.yml b/.github/workflows/requirements-cron.yml
@@ -26,7 +26,8 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install pip-tools
+          pip install pip-tools!=6.0.0
+        # https://github.com/jazzband/pip-tools/pull/1353
       - name: Upgrade dependencies
         run: bash reqs/upgrade.sh
       - uses: actions/upload-artifact@v2

diff --git a/.github/workflows/requirements-pr.yml b/.github/workflows/requirements-pr.yml
@@ -44,7 +44,8 @@ jobs:
         if: steps.git-diff.outputs.dependency-changes != ''
         run: |
           python -m pip install --upgrade pip
-          pip install pip-tools
+          pip install pip-tools!=6.0.0
+        # https://github.com/jazzband/pip-tools/pull/1353
       - name: Upgrade dependencies
         if: steps.git-diff.outputs.dependency-changes != ''
         run: bash reqs/upgrade.sh

diff --git a/cspell.json b/cspell.json
@@ -109,6 +109,7 @@
     "ignoreWords": [
         "amplitf",
         "arange",
+        "asdot",
         "atfi",
         "axvline",
         "cano",

diff --git a/docs/usage.ipynb b/docs/usage.ipynb
@@ -82,8 +82,7 @@
     "    allowed_interaction_types=[\"strong\", \"EM\"],\n",
     "    formalism_type=\"canonical-helicity\",\n",
     ")\n",
-    "graphs = result.collapse_graphs()\n",
-    "dot = es.io.convert_to_dot(graphs)\n",
+    "dot = es.io.asdot(result, collapse_graphs=True)\n",
     "graphviz.Source(dot)"
    ]
   },
@@ -193,8 +192,8 @@
    },
    "outputs": [],
    "source": [
-    "phsp_set = model.adapter.convert(phsp_sample)\n",
-    "data_set = model.adapter.convert(data_sample)\n",
+    "phsp_set = data_converter.transform(phsp_sample)\n",
+    "data_set = data_converter.transform(data_sample)\n",
     "data_frame = pd.DataFrame(data_set.to_pandas())\n",
     "data_frame[\"m_12\"].hist(bins=100, alpha=0.5, density=True)\n",
     "indicate_masses()\n",

diff --git a/docs/usage/step1.ipynb b/docs/usage/step1.ipynb
@@ -66,8 +66,7 @@
    "source": [
     "from graphviz import Source\n",
     "\n",
-    "graphs = result.collapse_graphs()\n",
-    "dot = es.io.convert_to_dot(graphs)\n",
+    "dot = es.io.asdot(result, collapse_graphs=True)\n",
     "Source(dot)"
    ]
   },

diff --git a/reqs/3.6/requirements-dev.txt b/reqs/3.6/requirements-dev.txt
@@ -39,14 +39,14 @@ dm-tree==0.1.5
 docutils==0.16
 entrypoints==0.3
 execnet==1.8.0
-expertsystem==0.7.0a0
+expertsystem==0.7.0
 filelock==3.0.12
 flake8-blind-except==0.2.0
 flake8-bugbear==21.3.2
 flake8-builtins==1.5.3
 flake8-polyfill==1.0.2
 flake8-rst-docstrings==0.0.14
-flake8==3.8.4
+flake8==3.9.0
 flatbuffers==1.12
 fuzzywuzzy==0.18.0
 gast==0.3.3
@@ -60,12 +60,12 @@ graphviz==0.16
 grpcio==1.32.0
 h5py==2.10.0
 hepunits==2.1.0
-identify==2.1.2
+identify==2.1.3
 idna==2.10
 imagesize==1.2.0
 iminuit==2.4.0
 immutables==0.15
-importlib-metadata==3.7.2
+importlib-metadata==3.7.3
 importlib-resources==3.0.0
 iniconfig==1.1.1
 ipykernel==5.5.0
@@ -80,14 +80,14 @@ jinja2==2.11.3
 json5==0.9.5
 jsonschema==3.2.0
 jupyter-cache==0.4.2
-jupyter-client==6.1.11
+jupyter-client==6.1.12
 jupyter-console==6.2.0
 jupyter-core==4.7.1
 jupyter-packaging==0.7.12
 jupyter-server==1.4.1
 jupyter-sphinx==0.3.1
 jupyter==1.0.0
-jupyterlab-code-formatter==1.4.4
+jupyterlab-code-formatter==1.4.5
 jupyterlab-server==2.3.0
 jupyterlab-widgets==1.0.0
 jupyterlab==3.0.10
@@ -143,13 +143,13 @@ ptyprocess==0.7.0
 py==1.10.0
 pyasn1-modules==0.2.8
 pyasn1==0.4.8
-pycodestyle==2.6.0
+pycodestyle==2.7.0
 pycparser==2.20
 pydata-sphinx-theme==0.4.3
 pydeps==1.9.13
 pydocstyle==5.1.1
 pydot==1.4.2
-pyflakes==2.2.0
+pyflakes==2.3.0
 pygments==2.8.1
 pylint==2.7.2
 pyparsing==2.4.7
@@ -179,8 +179,8 @@ smmap==3.0.5
 sniffio==1.2.0
 snowballstemmer==2.1.0
 soupsieve==2.2
-sphinx-autobuild==2020.9.1
-sphinx-book-theme==0.0.41
+sphinx-autobuild==2021.3.14
+sphinx-book-theme==0.0.42
 sphinx-copybutton==0.3.1
 sphinx-panels==0.5.2
 sphinx-thebe==0.0.8
@@ -211,7 +211,7 @@ tqdm==4.59.0
 traitlets==4.3.3
 typed-ast==1.4.2
 typing-extensions==3.7.4.3 ; python_version < "3.8.0"
-urllib3==1.26.3
+urllib3==1.26.4
 virtualenv==20.4.2
 wcwidth==0.2.5
 webencodings==0.5.1

diff --git a/reqs/3.6/requirements-doc.txt b/reqs/3.6/requirements-doc.txt
@@ -28,7 +28,7 @@ defusedxml==0.7.1
 dm-tree==0.1.5
 docutils==0.16
 entrypoints==0.3
-expertsystem==0.7.0a0
+expertsystem==0.7.0
 flatbuffers==1.12
 fuzzywuzzy==0.18.0
 gast==0.3.3
@@ -44,7 +44,7 @@ hepunits==2.1.0
 idna==2.10
 imagesize==1.2.0
 iminuit==2.4.0
-importlib-metadata==3.7.2
+importlib-metadata==3.7.3
 importlib-resources==3.0.0
 ipykernel==5.5.0
 ipython-genutils==0.2.0
@@ -56,7 +56,7 @@ jedi==0.18.0
 jinja2==2.11.3
 jsonschema==3.2.0
 jupyter-cache==0.4.2
-jupyter-client==6.1.11
+jupyter-client==6.1.12
 jupyter-console==6.2.0
 jupyter-core==4.7.1
 jupyter-sphinx==0.3.1
@@ -118,7 +118,7 @@ six==1.15.0
 smmap==3.0.5
 snowballstemmer==2.1.0
 soupsieve==2.2
-sphinx-book-theme==0.0.41
+sphinx-book-theme==0.0.42
 sphinx-copybutton==0.3.1
 sphinx-panels==0.5.2
 sphinx-thebe==0.0.8
@@ -145,7 +145,7 @@ tornado==6.1
 tqdm==4.59.0
 traitlets==4.3.3
 typing-extensions==3.7.4.3 ; python_version < "3.8.0"
-urllib3==1.26.3
+urllib3==1.26.4
 wcwidth==0.2.5
 webencodings==0.5.1
 werkzeug==1.0.1

diff --git a/reqs/3.6/requirements-sty.txt b/reqs/3.6/requirements-sty.txt
@@ -26,14 +26,14 @@ distlib==0.3.1
 dm-tree==0.1.5
 docutils==0.16
 execnet==1.8.0
-expertsystem==0.7.0a0
+expertsystem==0.7.0
 filelock==3.0.12
 flake8-blind-except==0.2.0
 flake8-bugbear==21.3.2
 flake8-builtins==1.5.3
 flake8-polyfill==1.0.2
 flake8-rst-docstrings==0.0.14
-flake8==3.8.4
+flake8==3.9.0
 flatbuffers==1.12
 gast==0.3.3
 google-auth-oauthlib==0.4.3
@@ -43,10 +43,10 @@ gprof2dot==2021.2.21
 grpcio==1.32.0
 h5py==2.10.0
 hepunits==2.1.0
-identify==2.1.2
+identify==2.1.3
 idna==2.10
 iminuit==2.4.0
-importlib-metadata==3.7.2
+importlib-metadata==3.7.3
 importlib-resources==3.0.0
 iniconfig==1.1.1
 ipython-genutils==0.2.0
@@ -85,10 +85,10 @@ protobuf==3.15.6
 py==1.10.0
 pyasn1-modules==0.2.8
 pyasn1==0.4.8
-pycodestyle==2.6.0
+pycodestyle==2.7.0
 pydocstyle==5.1.1
 pydot==1.4.2
-pyflakes==2.2.0
+pyflakes==2.3.0
 pylint==2.7.2
 pyparsing==2.4.7
 pyrsistent==0.17.3
@@ -121,7 +121,7 @@ tqdm==4.59.0
 traitlets==4.3.3
 typed-ast==1.4.2
 typing-extensions==3.7.4.3 ; python_version < "3.8.0"
-urllib3==1.26.3
+urllib3==1.26.4
 virtualenv==20.4.2
 werkzeug==1.0.1
 wheel==0.36.2

diff --git a/reqs/3.6/requirements-test.txt b/reqs/3.6/requirements-test.txt
@@ -18,7 +18,7 @@ cycler==0.10.0
 decorator==4.4.2
 dm-tree==0.1.5
 execnet==1.8.0
-expertsystem==0.7.0a0
+expertsystem==0.7.0
 flatbuffers==1.12
 gast==0.3.3
 google-auth-oauthlib==0.4.3
@@ -30,7 +30,7 @@ h5py==2.10.0
 hepunits==2.1.0
 idna==2.10
 iminuit==2.4.0
-importlib-metadata==3.7.2
+importlib-metadata==3.7.3
 importlib-resources==3.0.0
 iniconfig==1.1.1
 jax==0.2.10
@@ -81,7 +81,7 @@ termcolor==1.1.0
 toml==0.10.2
 tqdm==4.59.0
 typing-extensions==3.7.4.3 ; python_version < "3.8.0"
-urllib3==1.26.3
+urllib3==1.26.4
 werkzeug==1.0.1
 wheel==0.36.2
 wrapt==1.12.1

diff --git a/reqs/3.6/requirements.txt b/reqs/3.6/requirements.txt
@@ -14,7 +14,7 @@ chardet==4.0.0
 cloudpickle==1.6.0
 decorator==4.4.2
 dm-tree==0.1.5
-expertsystem==0.7.0a0
+expertsystem==0.7.0
 flatbuffers==1.12
 gast==0.3.3
 google-auth-oauthlib==0.4.3
@@ -25,7 +25,7 @@ h5py==2.10.0
 hepunits==2.1.0
 idna==2.10
 iminuit==2.4.0
-importlib-metadata==3.7.2
+importlib-metadata==3.7.3
 importlib-resources==3.0.0
 jsonschema==3.2.0
 keras-preprocessing==1.1.2
@@ -58,7 +58,7 @@ tensorflow==2.4.1
 termcolor==1.1.0
 tqdm==4.59.0
 typing-extensions==3.7.4.3 ; python_version < "3.8.0"
-urllib3==1.26.3
+urllib3==1.26.4
 werkzeug==1.0.1
 wheel==0.36.2
 wrapt==1.12.1

diff --git a/reqs/3.7/requirements-dev.txt b/reqs/3.7/requirements-dev.txt
@@ -37,14 +37,14 @@ dm-tree==0.1.5
 docutils==0.16
 entrypoints==0.3
 execnet==1.8.0
-expertsystem==0.7.0a0
+expertsystem==0.7.0
 filelock==3.0.12
 flake8-blind-except==0.2.0
 flake8-bugbear==21.3.2
 flake8-builtins==1.5.3
 flake8-polyfill==1.0.2
 flake8-rst-docstrings==0.0.14
-flake8==3.8.4
+flake8==3.9.0
 flatbuffers==1.12
 fuzzywuzzy==0.18.0
 gast==0.3.3
@@ -58,11 +58,11 @@ graphviz==0.16
 grpcio==1.32.0
 h5py==2.10.0
 hepunits==2.1.0
-identify==2.1.2
+identify==2.1.3
 idna==2.10
 imagesize==1.2.0
 iminuit==2.4.0
-importlib-metadata==3.7.2
+importlib-metadata==3.7.3
 iniconfig==1.1.1
 ipykernel==5.5.0
 ipython-genutils==0.2.0
@@ -76,14 +76,14 @@ jinja2==2.11.3
 json5==0.9.5
 jsonschema==3.2.0
 jupyter-cache==0.4.2
-jupyter-client==6.1.11
+jupyter-client==6.1.12
 jupyter-console==6.2.0
 jupyter-core==4.7.1
 jupyter-packaging==0.7.12
 jupyter-server==1.4.1
 jupyter-sphinx==0.3.1
 jupyter==1.0.0
-jupyterlab-code-formatter==1.4.4
+jupyterlab-code-formatter==1.4.5
 jupyterlab-server==2.3.0
 jupyterlab-widgets==1.0.0
 jupyterlab==3.0.10
@@ -139,13 +139,13 @@ ptyprocess==0.7.0
 py==1.10.0
 pyasn1-modules==0.2.8
 pyasn1==0.4.8
-pycodestyle==2.6.0
+pycodestyle==2.7.0
 pycparser==2.20
 pydata-sphinx-theme==0.4.3
 pydeps==1.9.13
 pydocstyle==5.1.1
 pydot==1.4.2
-pyflakes==2.2.0
+pyflakes==2.3.0
 pygments==2.8.1
 pylint==2.7.2
 pyparsing==2.4.7
@@ -175,8 +175,8 @@ smmap==3.0.5
 sniffio==1.2.0
 snowballstemmer==2.1.0
 soupsieve==2.2
-sphinx-autobuild==2020.9.1
-sphinx-book-theme==0.0.41
+sphinx-autobuild==2021.3.14
+sphinx-book-theme==0.0.42
 sphinx-copybutton==0.3.1
 sphinx-panels==0.5.2
 sphinx-thebe==0.0.8
@@ -207,7 +207,7 @@ tqdm==4.59.0
 traitlets==5.0.5
 typed-ast==1.4.2
 typing-extensions==3.7.4.3 ; python_version < "3.8.0"
-urllib3==1.26.3
+urllib3==1.26.4
 virtualenv==20.4.2
 wcwidth==0.2.5
 webencodings==0.5.1