From 003112414b6c076a179a3311fc70315d9109b338 Mon Sep 17 00:00:00 2001 From: Kandai Watanabe Date: Fri, 26 Jul 2024 10:50:36 -0600 Subject: [PATCH] tried fixing, but failed --- .../setup-poetry-dependencies/action.yml | 7 ++++ .github/workflows/deploy-documentation.yml | 2 +- .github/workflows/test-docs-gen.yml | 2 +- .github/workflows/test.yml | 4 +++ poetry.lock | 33 +------------------ pyproject.toml | 12 +++---- 6 files changed, 20 insertions(+), 40 deletions(-) diff --git a/.github/actions/setup-poetry-dependencies/action.yml b/.github/actions/setup-poetry-dependencies/action.yml index 02b17af..c9270e9 100644 --- a/.github/actions/setup-poetry-dependencies/action.yml +++ b/.github/actions/setup-poetry-dependencies/action.yml @@ -59,6 +59,13 @@ runs: run: | poetry env use py + - name : Install suite-sparse for mac to install cvxopt + if: runner.os == 'macOS' + shell: bash + run: | + brew install suite-sparse + poetry run pip install cvxopt==1.3.2 + - name: Install dependencies if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' shell: bash diff --git a/.github/workflows/deploy-documentation.yml b/.github/workflows/deploy-documentation.yml index 3e9aeb3..8260040 100644 --- a/.github/workflows/deploy-documentation.yml +++ b/.github/workflows/deploy-documentation.yml @@ -46,7 +46,7 @@ jobs: with: cache-key: ${{ format(env.venv-cache-key-fmt, env.os, steps.setup-python.outputs.python-version, hashFiles('**/poetry.lock')) }} python-version: ${{ steps.setup-python.outputs.python-version }} - poetry-install-args: --no-interaction --with dev + poetry-install-args: --no-interaction --with docs - name: Sphinx build run: | diff --git a/.github/workflows/test-docs-gen.yml b/.github/workflows/test-docs-gen.yml index aeec128..4999964 100644 --- a/.github/workflows/test-docs-gen.yml +++ b/.github/workflows/test-docs-gen.yml @@ -45,7 +45,7 @@ jobs: with: cache-key: ${{ format(env.venv-cache-key-fmt, env.os, steps.setup-python.outputs.python-version, hashFiles('**/poetry.lock')) }} python-version: ${{ steps.setup-python.outputs.python-version }} - poetry-install-args: --no-interaction --with dev + poetry-install-args: --no-interaction --with docs - name: Sphinx build run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d6720a..a9cbb38 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,11 @@ name: '🧪 Test' on: workflow_dispatch: push: + branches: + - main pull_request: + branches: + - main jobs: py-test: diff --git a/poetry.lock b/poetry.lock index 03588f3..ba0aa47 100644 --- a/poetry.lock +++ b/poetry.lock @@ -458,37 +458,6 @@ tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.1 [package.extras] toml = ["tomli"] -[[package]] -name = "cvxopt" -version = "1.2.7" -description = "Convex optimization package" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -files = [ - {file = "cvxopt-1.2.7-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:dd87afaa82bc4f0b4436eeeee0c0c86cd504bf519d7b0fe28057be7479676b51"}, - {file = "cvxopt-1.2.7-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b2c30772b8d0cd4ae528af60c3ac732c07670c65f0539746f9a30eb14c5d7a17"}, - {file = "cvxopt-1.2.7-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:803a1c2bdce5f15fe0f20f0a26e39a251cede121091317f91ef1bcfd73f7ef38"}, - {file = "cvxopt-1.2.7-cp35-cp35m-win32.whl", hash = "sha256:0cdf9abac90cdd727558f57588e776f6cdb12362f6adf2cb4d2b6d629d9125c8"}, - {file = "cvxopt-1.2.7-cp35-cp35m-win_amd64.whl", hash = "sha256:6cd7e6cd626e202b085995e63805b645567bfe3bd133cdc2cdb89b9842062081"}, - {file = "cvxopt-1.2.7-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:4ed667bd82f91b832d33f14f535deb66c8eb0a3ad0c5f9e9cbd0a10523ff79bc"}, - {file = "cvxopt-1.2.7-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ec6e46c3392adaae455286aab02daf03ccf3878a543de4c18f11ea6e1131c74b"}, - {file = "cvxopt-1.2.7-cp36-cp36m-win32.whl", hash = "sha256:ac02d62a311b84d3b88ea8472052d85e72714e96024608542d48eb04a788b4d7"}, - {file = "cvxopt-1.2.7-cp36-cp36m-win_amd64.whl", hash = "sha256:2c292500d8252d6895ab998f84d7c1724a272ee4e9851ca74b2947429cb2b087"}, - {file = "cvxopt-1.2.7-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c91ae903b69cc1bed7a58ea1bbc74f19daec9f03a7d09c41abb21c5328d2ea58"}, - {file = "cvxopt-1.2.7-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc0d997e8ca3fb8eab733cc7c32eff8137890637de24f7b0d892ad185fbc54e6"}, - {file = "cvxopt-1.2.7-cp37-cp37m-win32.whl", hash = "sha256:22fb842920fcaf8adb9a60cf9af9401363b32430150986d7191e9504b0235254"}, - {file = "cvxopt-1.2.7-cp37-cp37m-win_amd64.whl", hash = "sha256:b55ebc43095ca29b4c835bdc22f2a2c4df06ccbbb9fa6a7e6096dceefd412b4f"}, - {file = "cvxopt-1.2.7-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6c6fa32cc49eaa89f8ed00c03e4717854827e0753c7da0026e934d5c24c5dd28"}, - {file = "cvxopt-1.2.7-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8002390c4a8b55fbf4011cf6e663f0b219459edf2423e9791e393b92e41cf8c8"}, - {file = "cvxopt-1.2.7-cp38-cp38-win32.whl", hash = "sha256:1381315f68f728a3fab4eba1c2352605f074b10494ebe8fe008b0947ce13b589"}, - {file = "cvxopt-1.2.7-cp38-cp38-win_amd64.whl", hash = "sha256:712975afb3ed3d14dea2ab1eca774b70f2b58db61a88e70708c912e15339113c"}, - {file = "cvxopt-1.2.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fac53f7d2814278475ecd9f2f22e997a92fbf7f044672caee946d9773c79fef9"}, - {file = "cvxopt-1.2.7-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:03bbfe48b9d6148064cc5af9cfb288de3c99cbe93601aa2de65c61d3c7253bad"}, - {file = "cvxopt-1.2.7-cp39-cp39-win32.whl", hash = "sha256:97262506af8c5fffadcabb4b0ed9caa67ab94c46e08e16b563736a274f7b8601"}, - {file = "cvxopt-1.2.7-cp39-cp39-win_amd64.whl", hash = "sha256:b6604befe48283f6d71a31d10a6a286e13c11644dd34e108d873293aa5ccec8d"}, - {file = "cvxopt-1.2.7.tar.gz", hash = "sha256:3f9db1f4d4e820aaea81d6fc21054c89dc6327c84f935dd5a1eda1af11e1d504"}, -] - [[package]] name = "cvxopt" version = "1.3.2" @@ -3247,4 +3216,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.13" -content-hash = "0421b2414b0a9edbd239e979a74379cc35460a9f3e61fdeec235d2d00e87b961" +content-hash = "99a4d5d6db221a0a9842d15bc232b012604c30f5bb37b580fab91f1bc67366e1" diff --git a/pyproject.toml b/pyproject.toml index 9e98f56..61b925a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,13 +14,13 @@ readme = "README.md" python = ">=3.8,<3.13" bidict = "^0.23.1" click = "^8.1.7" -# For Linux, Mac (not M1), and Windows -cvxopt = [ - {version=">=1.3.2", python = ">=3.9"}, - {version="=1.2.7", python = "=3.8"} -] +# For Linux and Windows. TESTS FAIL ON MAC FOR python3.8!!! +# cvxopt = [ +# {version="^1.3.2", platform="linux"}, +# {version="^1.3.2", platform="win32"}, +# ] # For MacOS M1 -# kvxopt={version="1.3.2.0", markers='sys_platform == "darwin" and platform_machine != "x86_64"'} +# kvxopt={version="1.3.2.0", markers='sys_platform == "Darwin" and platform_machine == "arm"'} distinctipy = "^1.3.4" graphviz = "^0.20.3" gurobipy = {version="10.0.3"}