Commit 59f26f9a authored by Andrew's avatar Andrew
Browse files

Fixed issue with Edisyn and poetry. Now you must uncomment a line in...

Fixed issue with Edisyn and poetry. Now you must uncomment a line in pyproject.toml if you want to use Edisyn
parent c504527c
......@@ -86,7 +86,7 @@ python library [EdiSyn](https://gitlab.eecs.umich.edu/M-DES-tools/EdiSyn). To in
$ git clone https://gitlab.eecs.umich.edu/M-DES-tools/EdiSyn.git
Then edit `pyproject.toml` to point to this directory. For development EdiSyn can be used in the editable mode.
Then edit `pyproject.toml` to point to this directory. You will need to uncomment this line. For development EdiSyn can be used in the editable mode.
Finally, to use this optional dependency, use the command:
$ poetry install --extras "opacity_enf"
......
......@@ -167,27 +167,6 @@ category = "dev"
optional = false
python-versions = "*"
[[package]]
name = "edisyn"
version = "1.0.0"
description = "Opacity enforcement"
category = "main"
optional = true
python-versions = "^3.7"
develop = true
[package.dependencies]
dd = "^0.5.6"
natsort = "^7.1.1"
nose = "^1.3.7"
[package.extras]
benchmarks = ["sh (>=1.14.2,<2.0.0)", "matplotlib (>=3.5.1,<4.0.0)"]
[package.source]
type = "directory"
url = "../EdiSyn"
[[package]]
name = "filelock"
version = "3.7.1"
......@@ -296,18 +275,6 @@ category = "dev"
optional = false
python-versions = ">=3.5"
[[package]]
name = "natsort"
version = "7.2.0"
description = "Simple yet flexible natural sorting in Python."
category = "main"
optional = true
python-versions = ">=3.6"
[package.extras]
fast = ["fastnumbers (>=2.0.0)"]
icu = ["PyICU (>=1.0.0)"]
[[package]]
name = "networkx"
version = "2.6.3"
......@@ -331,14 +298,6 @@ category = "dev"
optional = false
python-versions = "*"
[[package]]
name = "nose"
version = "1.3.7"
description = "nose extends unittest to make testing easier"
category = "main"
optional = true
python-versions = "*"
[[package]]
name = "packaging"
version = "21.3"
......@@ -692,12 +651,12 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-
[extras]
caching = ["pycairo"]
opacity_enf = ["edisyn"]
opacity_enf = []
[metadata]
lock-version = "1.1"
python-versions = "^3.7"
content-hash = "97b807ead14e497821de4ad974082ab98864b943bb19cf4f0a0e9897698616b0"
content-hash = "d8584cef57423879da49fba0ec3103d2000028cd3cead45d260e66834dc43a2d"
[metadata.files]
appdirs = [
......@@ -762,7 +721,6 @@ distlib = [
{file = "distlib-0.3.4-py2.py3-none-any.whl", hash = "sha256:6564fe0a8f51e734df6333d08b8b94d4ea8ee6b99b5ed50613f731fd4089f34b"},
{file = "distlib-0.3.4.zip", hash = "sha256:e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579"},
]
edisyn = []
filelock = [
{file = "filelock-3.7.1-py3-none-any.whl", hash = "sha256:37def7b658813cda163b56fc564cdc75e86d338246458c4c28ae84cabefa2404"},
{file = "filelock-3.7.1.tar.gz", hash = "sha256:3a0fd85166ad9dbab54c9aec96737b744106dc5f15c0b09a6744a445299fcf04"},
......@@ -844,10 +802,6 @@ more-itertools = [
{file = "more-itertools-8.13.0.tar.gz", hash = "sha256:a42901a0a5b169d925f6f217cd5a190e32ef54360905b9c39ee7db5313bfec0f"},
{file = "more_itertools-8.13.0-py3-none-any.whl", hash = "sha256:c5122bffc5f104d37c1626b8615b511f3427aa5389b94d61e5ef8236bfbc3ddb"},
]
natsort = [
{file = "natsort-7.2.0-py3-none-any.whl", hash = "sha256:24f245daf9622683d4d2dfbd6076ba4aa0054074e73bbeea4253b4bfec0ea2bc"},
{file = "natsort-7.2.0.tar.gz", hash = "sha256:e7054b4e1f47365f141602a742685165a552291b643a214652d0dd9d6cea58d1"},
]
networkx = [
{file = "networkx-2.6.3-py3-none-any.whl", hash = "sha256:80b6b89c77d1dfb64a4c7854981b60aeea6360ac02c6d4e4913319e0a313abef"},
{file = "networkx-2.6.3.tar.gz", hash = "sha256:c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51"},
......@@ -856,11 +810,6 @@ nodeenv = [
{file = "nodeenv-1.6.0-py2.py3-none-any.whl", hash = "sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7"},
{file = "nodeenv-1.6.0.tar.gz", hash = "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b"},
]
nose = [
{file = "nose-1.3.7-py2-none-any.whl", hash = "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a"},
{file = "nose-1.3.7-py3-none-any.whl", hash = "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac"},
{file = "nose-1.3.7.tar.gz", hash = "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"},
]
packaging = [
{file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
{file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
......
......@@ -20,8 +20,8 @@ colorama = {version = "^0.4.3", platform = "windows"}
# Optional dependencies for opacity verification and enforcement
# Edisyn
#edisyn = { version="^1.0.0", optional = true}
edisyn = {path = "../edisyn", optional = true, develop = true}
# uncomment the next line if you have installed edisyn locally
# edisyn = {path = "../edisyn", optional = true, develop = true}
[tool.poetry.dev-dependencies]
pytest = "^5.2"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment