diff --git a/NORDic_vignette.ipynb b/NORDic_vignette.ipynb index df96ac0..9d547aa 100644 --- a/NORDic_vignette.ipynb +++ b/NORDic_vignette.ipynb @@ -40,7 +40,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 6, "id": "880ae4d3", "metadata": { "scrolled": true @@ -50,62 +50,67 @@ "name": "stdout", "output_type": "stream", "text": [ - "Processing ./dist/NORDic-1.0.4-py3-none-any.whl\n", - "Collecting mpbn-sim@ git+https://github.com/bnediction/mpbn-sim.git@5f919c5c62e111628136d62357902966404b988e#egg=mpbn_sim\n", - " Using cached mpbn_sim-0.1-py3-none-any.whl\n", - "Requirement already satisfied: qnorm==0.5.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.4) (0.5.1)\n", - "Requirement already satisfied: graphviz==0.20.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.4) (0.20.1)\n", - "Requirement already satisfied: tqdm==4.62.3 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.4) (4.62.3)\n", - "Requirement already satisfied: scipy==1.6.2 in /home/kali/.local/lib/python3.8/site-packages (from NORDic==1.0.4) (1.6.2)\n", - "Requirement already satisfied: cmapPy==4.0.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.4) (4.0.1)\n", - "Requirement already satisfied: clingo==5.6.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.4) (5.6.1)\n", - "Requirement already satisfied: bonesis==0.4.91 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.4) (0.4.91)\n", - "Requirement already satisfied: scikit-learn==1.1.2 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.4) (1.1.2)\n", - "Requirement already satisfied: matplotlib==3.3.4 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.4) (3.3.4)\n", - "Requirement already satisfied: mpbn>=1.7 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from bonesis==0.4.91->NORDic==1.0.4) (1.7)\n", - "Requirement already satisfied: numpy in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from bonesis==0.4.91->NORDic==1.0.4) (1.22.4)\n", - "Requirement already satisfied: boolean.py in /home/kali/.local/lib/python3.8/site-packages (from bonesis==0.4.91->NORDic==1.0.4) (3.8)\n", - "Requirement already satisfied: colomoto-jupyter in /home/kali/.local/lib/python3.8/site-packages (from bonesis==0.4.91->NORDic==1.0.4) (0.8.1)\n", - "Requirement already satisfied: networkx in /home/kali/.local/lib/python3.8/site-packages (from bonesis==0.4.91->NORDic==1.0.4) (2.5.1)\n", - "Requirement already satisfied: pandas in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from bonesis==0.4.91->NORDic==1.0.4) (1.5.1)\n", - "Requirement already satisfied: cffi in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from clingo==5.6.1->NORDic==1.0.4) (1.15.1)\n", - "Requirement already satisfied: requests>=2.13.0 in /home/kali/.local/lib/python3.8/site-packages (from cmapPy==4.0.1->NORDic==1.0.4) (2.25.1)\n", - "Requirement already satisfied: h5py>=2.6.0 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from cmapPy==4.0.1->NORDic==1.0.4) (3.7.0)\n", - "Requirement already satisfied: six in /home/kali/.local/lib/python3.8/site-packages (from cmapPy==4.0.1->NORDic==1.0.4) (1.15.0)\n", - "Requirement already satisfied: pillow>=6.2.0 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from matplotlib==3.3.4->NORDic==1.0.4) (9.2.0)\n", - "Requirement already satisfied: kiwisolver>=1.0.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from matplotlib==3.3.4->NORDic==1.0.4) (1.4.4)\n", - "Requirement already satisfied: python-dateutil>=2.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from matplotlib==3.3.4->NORDic==1.0.4) (2.8.2)\n", - "Requirement already satisfied: pyparsing!=2.0.4,!=2.1.2,!=2.1.6,>=2.0.3 in /home/kali/.local/lib/python3.8/site-packages (from matplotlib==3.3.4->NORDic==1.0.4) (2.4.7)\n", - "Requirement already satisfied: cycler>=0.10 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from matplotlib==3.3.4->NORDic==1.0.4) (0.11.0)\n", - "Requirement already satisfied: numba in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from qnorm==0.5.1->NORDic==1.0.4) (0.56.3)\n", - "Requirement already satisfied: threadpoolctl>=2.0.0 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from scikit-learn==1.1.2->NORDic==1.0.4) (3.1.0)\n", - "Requirement already satisfied: joblib>=1.0.0 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from scikit-learn==1.1.2->NORDic==1.0.4) (1.2.0)\n", - "Requirement already satisfied: beautifulsoup4 in /home/kali/.local/lib/python3.8/site-packages (from colomoto-jupyter->bonesis==0.4.91->NORDic==1.0.4) (4.9.3)\n", - "Requirement already satisfied: pydot in /home/kali/.local/lib/python3.8/site-packages (from colomoto-jupyter->bonesis==0.4.91->NORDic==1.0.4) (1.4.2)\n", - "Requirement already satisfied: decorator<5,>=4.3 in /home/kali/.local/lib/python3.8/site-packages (from networkx->bonesis==0.4.91->NORDic==1.0.4) (4.4.2)\n", - "Requirement already satisfied: pytz>=2020.1 in /home/kali/.local/lib/python3.8/site-packages (from pandas->bonesis==0.4.91->NORDic==1.0.4) (2021.1)\n", - "Requirement already satisfied: idna<3,>=2.5 in /home/kali/.local/lib/python3.8/site-packages (from requests>=2.13.0->cmapPy==4.0.1->NORDic==1.0.4) (2.10)\n", - "Requirement already satisfied: chardet<5,>=3.0.2 in /home/kali/.local/lib/python3.8/site-packages (from requests>=2.13.0->cmapPy==4.0.1->NORDic==1.0.4) (4.0.0)\n", - "Requirement already satisfied: urllib3<1.27,>=1.21.1 in /home/kali/.local/lib/python3.8/site-packages (from requests>=2.13.0->cmapPy==4.0.1->NORDic==1.0.4) (1.26.12)\n", - "Requirement already satisfied: certifi>=2017.4.17 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from requests>=2.13.0->cmapPy==4.0.1->NORDic==1.0.4) (2022.9.24)\n", - "Requirement already satisfied: pycparser in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from cffi->clingo==5.6.1->NORDic==1.0.4) (2.21)\n", - "Requirement already satisfied: setuptools in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from numba->qnorm==0.5.1->NORDic==1.0.4) (65.5.0)\n", - "Requirement already satisfied: importlib-metadata in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from numba->qnorm==0.5.1->NORDic==1.0.4) (5.0.0)\n", - "Requirement already satisfied: llvmlite<0.40,>=0.39.0dev0 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from numba->qnorm==0.5.1->NORDic==1.0.4) (0.39.1)\n", - "Requirement already satisfied: soupsieve>1.2 in /home/kali/.local/lib/python3.8/site-packages (from beautifulsoup4->colomoto-jupyter->bonesis==0.4.91->NORDic==1.0.4) (2.2.1)\n", - "Requirement already satisfied: zipp>=0.5 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from importlib-metadata->numba->qnorm==0.5.1->NORDic==1.0.4) (3.9.0)\n", + "Collecting NORDic==1.0.5\n", + " Downloading NORDic-1.0.5-py3-none-any.whl (47 kB)\n", + "\u001b[2K \u001b[38;2;114;156;31m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\u001b[0m \u001b[32m48.0/48.0 kB\u001b[0m \u001b[31m7.8 MB/s\u001b[0m eta \u001b[36m0:00:00\u001b[0m\n", + "\u001b[?25hRequirement already satisfied: mpbn-sim==0.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.5) (0.1)\n", + "Requirement already satisfied: scipy==1.6.2 in /home/kali/.local/lib/python3.8/site-packages (from NORDic==1.0.5) (1.6.2)\n", + "Requirement already satisfied: qnorm==0.5.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.5) (0.5.1)\n", + "Requirement already satisfied: tqdm==4.62.3 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.5) (4.62.3)\n", + "Requirement already satisfied: cmapPy==4.0.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.5) (4.0.1)\n", + "Requirement already satisfied: clingo==5.6.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.5) (5.6.1)\n", + "Requirement already satisfied: bonesis==0.4.91 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.5) (0.4.91)\n", + "Requirement already satisfied: scikit-learn==1.1.2 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.5) (1.1.2)\n", + "Requirement already satisfied: matplotlib==3.3.4 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.5) (3.3.4)\n", + "Requirement already satisfied: graphviz==0.20.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from NORDic==1.0.5) (0.20.1)\n", + "Requirement already satisfied: pandas in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from bonesis==0.4.91->NORDic==1.0.5) (1.5.1)\n", + "Requirement already satisfied: networkx in /home/kali/.local/lib/python3.8/site-packages (from bonesis==0.4.91->NORDic==1.0.5) (2.5.1)\n", + "Requirement already satisfied: mpbn>=1.7 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from bonesis==0.4.91->NORDic==1.0.5) (1.7)\n", + "Requirement already satisfied: colomoto-jupyter in /home/kali/.local/lib/python3.8/site-packages (from bonesis==0.4.91->NORDic==1.0.5) (0.8.1)\n", + "Requirement already satisfied: boolean.py in /home/kali/.local/lib/python3.8/site-packages (from bonesis==0.4.91->NORDic==1.0.5) (3.8)\n", + "Requirement already satisfied: numpy in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from bonesis==0.4.91->NORDic==1.0.5) (1.22.4)\n", + "Requirement already satisfied: cffi in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from clingo==5.6.1->NORDic==1.0.5) (1.15.1)\n", + "Requirement already satisfied: requests>=2.13.0 in /home/kali/.local/lib/python3.8/site-packages (from cmapPy==4.0.1->NORDic==1.0.5) (2.25.1)\n", + "Requirement already satisfied: h5py>=2.6.0 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from cmapPy==4.0.1->NORDic==1.0.5) (3.7.0)\n", + "Requirement already satisfied: six in /home/kali/.local/lib/python3.8/site-packages (from cmapPy==4.0.1->NORDic==1.0.5) (1.15.0)\n", + "Requirement already satisfied: kiwisolver>=1.0.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from matplotlib==3.3.4->NORDic==1.0.5) (1.4.4)\n", + "Requirement already satisfied: python-dateutil>=2.1 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from matplotlib==3.3.4->NORDic==1.0.5) (2.8.2)\n", + "Requirement already satisfied: pyparsing!=2.0.4,!=2.1.2,!=2.1.6,>=2.0.3 in /home/kali/.local/lib/python3.8/site-packages (from matplotlib==3.3.4->NORDic==1.0.5) (2.4.7)\n", + "Requirement already satisfied: pillow>=6.2.0 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from matplotlib==3.3.4->NORDic==1.0.5) (9.2.0)\n", + "Requirement already satisfied: cycler>=0.10 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from matplotlib==3.3.4->NORDic==1.0.5) (0.11.0)\n", + "Requirement already satisfied: numba in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from qnorm==0.5.1->NORDic==1.0.5) (0.56.3)\n", + "Requirement already satisfied: threadpoolctl>=2.0.0 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from scikit-learn==1.1.2->NORDic==1.0.5) (3.1.0)\n", + "Requirement already satisfied: joblib>=1.0.0 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from scikit-learn==1.1.2->NORDic==1.0.5) (1.2.0)\n", + "Requirement already satisfied: pydot in /home/kali/.local/lib/python3.8/site-packages (from colomoto-jupyter->bonesis==0.4.91->NORDic==1.0.5) (1.4.2)\n", + "Requirement already satisfied: beautifulsoup4 in /home/kali/.local/lib/python3.8/site-packages (from colomoto-jupyter->bonesis==0.4.91->NORDic==1.0.5) (4.9.3)\n", + "Requirement already satisfied: decorator<5,>=4.3 in /home/kali/.local/lib/python3.8/site-packages (from networkx->bonesis==0.4.91->NORDic==1.0.5) (4.4.2)\n", + "Requirement already satisfied: pytz>=2020.1 in /home/kali/.local/lib/python3.8/site-packages (from pandas->bonesis==0.4.91->NORDic==1.0.5) (2021.1)\n", + "Requirement already satisfied: idna<3,>=2.5 in /home/kali/.local/lib/python3.8/site-packages (from requests>=2.13.0->cmapPy==4.0.1->NORDic==1.0.5) (2.10)\n", + "Requirement already satisfied: urllib3<1.27,>=1.21.1 in /home/kali/.local/lib/python3.8/site-packages (from requests>=2.13.0->cmapPy==4.0.1->NORDic==1.0.5) (1.26.12)\n", + "Requirement already satisfied: certifi>=2017.4.17 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from requests>=2.13.0->cmapPy==4.0.1->NORDic==1.0.5) (2022.9.24)\n", + "Requirement already satisfied: chardet<5,>=3.0.2 in /home/kali/.local/lib/python3.8/site-packages (from requests>=2.13.0->cmapPy==4.0.1->NORDic==1.0.5) (4.0.0)\n", + "Requirement already satisfied: pycparser in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from cffi->clingo==5.6.1->NORDic==1.0.5) (2.21)\n", + "Requirement already satisfied: llvmlite<0.40,>=0.39.0dev0 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from numba->qnorm==0.5.1->NORDic==1.0.5) (0.39.1)\n", + "Requirement already satisfied: importlib-metadata in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from numba->qnorm==0.5.1->NORDic==1.0.5) (5.0.0)\n", + "Requirement already satisfied: setuptools in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from numba->qnorm==0.5.1->NORDic==1.0.5) (65.5.0)\n", + "Requirement already satisfied: soupsieve>1.2 in /home/kali/.local/lib/python3.8/site-packages (from beautifulsoup4->colomoto-jupyter->bonesis==0.4.91->NORDic==1.0.5) (2.2.1)\n", + "Requirement already satisfied: zipp>=0.5 in /home/kali/miniconda3/envs/NORDic_env_notebooks/lib/python3.8/site-packages (from importlib-metadata->numba->qnorm==0.5.1->NORDic==1.0.5) (3.9.0)\n", "Installing collected packages: NORDic\n", - "Successfully installed NORDic-1.0.4\n" + " Attempting uninstall: NORDic\n", + " Found existing installation: NORDic 1.0.4\n", + " Uninstalling NORDic-1.0.4:\n", + " Successfully uninstalled NORDic-1.0.4\n", + "Successfully installed NORDic-1.0.5\n" ] } ], "source": [ - "! pip install NORDic" + "! pip install NORDic==1.0.5" ] }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 7, "id": "edf18ecc", "metadata": {}, "outputs": [ @@ -113,7 +118,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "NORDic 1.0.4\r\n" + "NORDic 1.0.5\r\n" ] } ], @@ -123,7 +128,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 8, "id": "2008342d", "metadata": {}, "outputs": [], diff --git a/setup.py b/setup.py index e1dc4d8..bd55fb1 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ from subprocess import check_call NAME = "NORDic" -VERSION = "1.0.4" +VERSION = "1.0.5" setup(name=NAME, version=VERSION,