From 26a7fe694e83addc6401185e9ce3130cc258d8be Mon Sep 17 00:00:00 2001 From: Eric Chu Date: Sat, 17 Nov 2018 00:43:16 -0800 Subject: [PATCH 01/79] [README.md] Add note about 2.0.7 --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index d57537e..3337f67 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,17 @@ when a bug in the Python module has been fixed and nothing in the underlying C solver has changed. The major version numbers should agree, however. +### What happened to 2.0.7? +Because version-syncing ECOS and ECOS-Python can be tricky, the 2.0.7 +version did not incorporate some minor changes to ECOS. In an +ill-advised move, the release was deleted in hopes it could be +re-uploaded, despite plenty warnings stating otherwise. + +Instead, a post release has been made that contains identical content to +the 2.0.7 release. Generally, `pip` should pick up the post release for +2.0.7 and any dependencies such as `pip install "ecos>=2.0.5"` should still +work as expected. + ## License ECOS is distributed under the [GNU General Public License From eeb4891c50690560772126fd3548ab1621743dc2 Mon Sep 17 00:00:00 2001 From: Shane Barratt Date: Mon, 15 Jun 2020 17:57:02 -0700 Subject: [PATCH 02/79] release GIL --- src/ecosmodule.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/ecosmodule.c b/src/ecosmodule.c index ad0a1c3..666b2d3 100644 --- a/src/ecosmodule.c +++ b/src/ecosmodule.c @@ -622,8 +622,10 @@ static PyObject *csolve(PyObject* self, PyObject *args, PyObject *kwargs) } /* This calls ECOS setup function. */ + Py_BEGIN_ALLOW_THREADS; myecos_bb_work = ECOS_BB_setup(n, m, p, l, ncones, q, e, Gpr, Gjc, Gir, Apr, Ajc, Air, cpr, hpr, bpr, num_bool, bool_vars_idx, num_int, int_vars_idx, &opts_ecos_bb); + Py_END_ALLOW_THREADS; if( myecos_bb_work == NULL ){ PyErr_SetString(PyExc_RuntimeError, "Internal problem occurred in ECOS_BB while setting up the problem.\nPlease send a bug report with data to Alexander Domahidi.\nEmail: domahidi@control.ee.ethz.ch"); if(q) free(q); @@ -651,13 +653,17 @@ static PyObject *csolve(PyObject* self, PyObject *args, PyObject *kwargs) mywork->stgs->nitref = opts_ecos.nitref; /* Solve! */ + Py_BEGIN_ALLOW_THREADS; exitcode = ECOS_BB_solve(myecos_bb_work); + Py_END_ALLOW_THREADS; mi_iterations =(long) myecos_bb_work->iter; } else{ /* This calls ECOS setup function. */ + Py_BEGIN_ALLOW_THREADS; mywork = ECOS_setup(n, m, p, l, ncones, q, e, Gpr, Gjc, Gir, Apr, Ajc, Air, cpr, hpr, bpr); + Py_END_ALLOW_THREADS; if( mywork == NULL ){ PyErr_SetString(PyExc_RuntimeError, "Internal problem occurred in ECOS while setting up the problem.\nPlease send a bug report with data to Alexander Domahidi.\nEmail: domahidi@control.ee.ethz.ch"); if(q) free(q); @@ -682,7 +688,9 @@ static PyObject *csolve(PyObject* self, PyObject *args, PyObject *kwargs) mywork->stgs->nitref = opts_ecos.nitref; /* Solve! */ + Py_BEGIN_ALLOW_THREADS; exitcode = ECOS_solve(mywork); + Py_END_ALLOW_THREADS; } /* create output (all data is *deep copied*) */ From 40eb28e93861b1867d869a9f33ba502423f7559f Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Mon, 19 Oct 2020 12:49:38 -0700 Subject: [PATCH 03/79] update submodule --- ecos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecos b/ecos index 2954b2a..40e26ef 160000 --- a/ecos +++ b/ecos @@ -1 +1 @@ -Subproject commit 2954b2a640f2194bf91dbf51e682be17012d7698 +Subproject commit 40e26efa371dd85b95bacc4ee825da80fa11a200 From 97db46bc65e243c75eadc06d36e36dcedce92f8c Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Wed, 21 Oct 2020 11:46:53 -0700 Subject: [PATCH 04/79] up to 2.0.8 --- ecos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecos b/ecos index 40e26ef..3b98fe0 160000 --- a/ecos +++ b/ecos @@ -1 +1 @@ -Subproject commit 40e26efa371dd85b95bacc4ee825da80fa11a200 +Subproject commit 3b98fe0376ceeeb8310a06694b0a84ac59920f3f From 03d18d2439674eabd71584bdeb34bfa4bd57212f Mon Sep 17 00:00:00 2001 From: Eric Chu Date: Sat, 16 Jan 2021 11:59:30 -0800 Subject: [PATCH 05/79] Update deploy keys --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cda3047..9196933 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ notifications: deploy: provider: releases api_key: - secure: EOGvA7WTRss3MYJiZWQI29FxHjuKZgteBzdBk7ZJW5a7VmjTVJMBbAD/EnDC2rRrtkhJ+8dtDpnA6y49bsktRnj3c+//SYryVgVu+gRuZRenRR9tAHiXNTylZ9+e1pJVUBwDLdaLuF1gmpQYYvzf5AGYLWSifhn+L3qytfBxj8w= + secure: VVUpxWmC7VkGcbniATyHZdxo7nMHqT7wYwzJ/lmvDm9IEhxwp2V9Fmra8J1oCRyBhVzbwqSsJzlAlffFu8DtneM6Ye0v4tWQr7Dt0XLICT+B0jz+YGeAQwsDljhNPQ5VsioDlrhoftD3gTBqKBQqMRDcSNwTISPUKZVcvDErBGU= file_glob: true file: wheelhouse/ecos-*.whl skip_cleanup: true From 3c0100ccacb4b6743d3ecb8ac59729195ce69aff Mon Sep 17 00:00:00 2001 From: Eric Chu Date: Sat, 16 Jan 2021 12:04:21 -0800 Subject: [PATCH 06/79] Update README --- README | 2 +- README.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README b/README index d1df3e7..6a93112 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ See the github repository for a detailed README. - http://github.com/ifa-ethz/ecos + http://github.com/embotech/ecos diff --git a/README.md b/README.md index 3337f67..e1dd1b8 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,12 @@ the 2.0.7 release. Generally, `pip` should pick up the post release for 2.0.7 and any dependencies such as `pip install "ecos>=2.0.5"` should still work as expected. +## Deployment +When creating new versions of the Python wrapper, please use +`bumpversion` to bump the version number and also remember to tag the +commit so that CI is able to properly pick it up. See +[Release](release.md) for more information. + ## License ECOS is distributed under the [GNU General Public License From 8a1f36c884ada8c6e9f4775c6301055d3f9eb950 Mon Sep 17 00:00:00 2001 From: Eric Chu Date: Sat, 16 Jan 2021 12:05:40 -0800 Subject: [PATCH 07/79] Add RELEASE instructions --- README.md | 2 +- RELEASE.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 RELEASE.md diff --git a/README.md b/README.md index e1dd1b8..a56ef4e 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,7 @@ work as expected. When creating new versions of the Python wrapper, please use `bumpversion` to bump the version number and also remember to tag the commit so that CI is able to properly pick it up. See -[Release](release.md) for more information. +[Release](RELEASE.md) for more information. ## License diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 0000000..7c0a280 --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,5 @@ +# How to make a release +1. Create a new tag on `master` +2. Push to github +3. Download artifacts from Travis and Appveyor +4. Upload to pypi From 1496dc60e2e02e006172ed2806febad73568361e Mon Sep 17 00:00:00 2001 From: Eric Chu Date: Sat, 16 Jan 2021 12:14:15 -0800 Subject: [PATCH 08/79] OSX build with user --- travis/build-osx-wheels.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis/build-osx-wheels.sh b/travis/build-osx-wheels.sh index 8a2c987..1ec26b8 100755 --- a/travis/build-osx-wheels.sh +++ b/travis/build-osx-wheels.sh @@ -2,8 +2,8 @@ set -e -x # Compile wheels -$PYTHON -m pip install nose coverage +$PYTHON -m pip install nose coverage --user $PYTHON -m pip wheel . -w wheelhouse/ -$PYTHON -m pip install ecos --no-index -f wheelhouse +$PYTHON -m pip install ecos --no-index -f wheelhouse --user $PYTHON -m nose --with-cover --cover-package=ecos src/test_interface.py src/test_interface_bb.py From eddecd63d2d3fefe993aa5c65664e7d8b033b22e Mon Sep 17 00:00:00 2001 From: Eric Chu Date: Sat, 16 Jan 2021 12:27:31 -0800 Subject: [PATCH 09/79] Remove Py2 support --- .travis.yml | 2 -- README.md | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9196933..63a96bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,6 @@ matrix: - docker env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 PRE_CMD=linux32 - - os: osx - env: PYTHON=python2 - os: osx env: PYTHON=python3 diff --git a/README.md b/README.md index a56ef4e..3bd93a7 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,12 @@ When creating new versions of the Python wrapper, please use commit so that CI is able to properly pick it up. See [Release](RELEASE.md) for more information. +## Python2 Support +Starting with version 2.0.8, ecos-python will no longer support +Python2.7. You may be able to download an [older +version](https://github.com/embotech/ecos-python/releases/tag/2.0.7.post1) +but moving forward we will no longer publish Python2 wheels for use. + ## License ECOS is distributed under the [GNU General Public License From ffed72168179f58c1c2cce168a893f1f46a52099 Mon Sep 17 00:00:00 2001 From: Eric Chu Date: Sat, 16 Jan 2021 12:27:41 -0800 Subject: [PATCH 10/79] Add more windows builds --- appveyor.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index f4131b5..0cdc7da 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,11 +7,17 @@ environment: - PYTHON: "C:\\Python34" - PYTHON: "C:\\Python35" - PYTHON: "C:\\Python36" + - PYTHON: "C:\\Python37" + - PYTHON: "C:\\Python38" + - PYTHON: "C:\\Python39" #- PYTHON: "C:\\Python27-x64" - PYTHON: "C:\\Python34-x64" DISTUTILS_USE_SDK: "1" - PYTHON: "C:\\Python35-x64" - PYTHON: "C:\\Python36-x64" + - PYTHON: "C:\\Python37-x64" + - PYTHON: "C:\\Python38-x64" + - PYTHON: "C:\\Python39-x64" install: # initialize the submodule From 78fffa2191ea8b5af90a7f547ca54e77df5a483f Mon Sep 17 00:00:00 2001 From: odidev Date: Mon, 19 Apr 2021 13:58:29 +0530 Subject: [PATCH 11/79] Add aarch64 wheel build support Signed-off-by: odidev --- .travis.yml | 7 +++++++ travis/build-wheels.sh | 3 +++ 2 files changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 63a96bd..b897fde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,13 @@ matrix: - docker env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 PRE_CMD=linux32 + - sudo: required + arch: arm64-graviton2 + group: edge + virt: lxd + services: + - docker + env: DOCKER_IMAGE=quay.io/pypa/manylinux2014_aarch64 - os: osx env: PYTHON=python3 diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index 63887e6..adecdb1 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -4,6 +4,9 @@ set -e -x # Install a system package required by our library #yum install -y atlas-devel +if [ $(uname -m) == "aarch64" ]; then + yum install -y blas-devel lapack-devel +fi # Compile wheels for PYBIN in /opt/python/*/bin; do "${PYBIN}/pip" install nose coverage #-r /io/dev-requirements.txt From b0664fa30bf6ef633ef50fc97d91747766e6b5c3 Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Sat, 11 Dec 2021 23:11:04 +0100 Subject: [PATCH 12/79] GitHub Actions (#1) * Initial MWE * Use bash shell * Run tests manually * Use make install * 3.6 - 3.9 * Use older pip version * Fix numpy * Double equals * Use conda * install xcode * Change shell * activate env * Install mkl * use macos 11 * Upgrade xcode * install gmp * downgrade xcode * single quotes * always downgrade * remove path * Only downgrade on macos * Build wheels * Remove build after test * Use python package * make version * Try fixed version * One step wheel build * Dont skip wheel build * Try all python versions * Define numpy version for older python * Add deploy check * Update example * fix typo --- .bumpversion.cfg | 4 +- .github/workflows/build.yml | 109 ++++++++++++++++++++++++++++++++++++ .travis.yml | 46 --------------- README.md | 20 ++++--- RELEASE.md | 5 -- appveyor.yml | 62 -------------------- appveyor/build.cmd | 21 ------- setup.py | 12 +--- travis/build-osx-wheels.sh | 9 --- travis/build-wheels.sh | 35 ------------ 10 files changed, 122 insertions(+), 201 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .travis.yml delete mode 100644 RELEASE.md delete mode 100644 appveyor.yml delete mode 100644 appveyor/build.cmd delete mode 100755 travis/build-osx-wheels.sh delete mode 100755 travis/build-wheels.sh diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 05762ab..78e9a26 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,9 +1,7 @@ [bumpversion] -current_version = 2.0.5 +current_version = 2.0.8 commit = True tag = True [bumpversion:file:setup.py] -[bumpversion:file:appveyor/conda-recipe/meta.yaml] - diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..473d5ea --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,109 @@ +name: build + +on: + pull_request: + push: + branches: + - master + tags: + - '*' + +jobs: + cleanup-runs: + runs-on: ubuntu-latest + steps: + - uses: rokroskar/workflow-run-cleanup-action@master + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'" + + build: + runs-on: ${{ matrix.os }} + defaults: + run: + shell: bash -l {0} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-18.04, macos-10.15, windows-2019 ] + python-version: [3.6, 3.7, 3.9 ] + include: + - os: ubuntu-18.04 + python-version: 3.8 + single_action_config: "True" + - os: macos-10.15 + python-version: 3.8 + - os: windows-2019 + python-version: 3.8 + + env: + RUNNER_OS: ${{ matrix.os }} + PYTHON_VERSION: ${{ matrix.python-version }} + SINGLE_ACTION_CONFIG: "${{ matrix.single_action_config == 'True' && 'True' || 'False' }}" + PYPI_SERVER: ${{ secrets.PYPI_SERVER }} + PYPI_USER: ${{ secrets.PYPI_USER }} + PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - uses: conda-incubator/setup-miniconda@v2 + with: + auto-update-conda: true + python-version: ${{ matrix.python-version }} + channels: conda-forge,anaconda + - name: Set Additional Envs + run: | + echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV + echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + + - name: Install dependencies + run: | + if [[ "$PYTHON_VERSION" == "3.6" ]] || [[ "$PYTHON_VERSION" == "3.7" ]] || [[ "$PYTHON_VERSION" == "3.8" ]]; then + conda install scipy=1.3 numpy=1.16 nose + elif [[ "$PYTHON_VERSION" == "3.9" ]]; then + conda install scipy=1.5 numpy=1.19 nose + fi + if [[ "$RUNNER_OS" == "macOS" ]]; then + sudo rm -rf /Library/Developer/CommandLineTools + fi + + - name: Downgrade xcode + if: runner.os == 'macOS' + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '10.3' + + - name: Test + run: | + make install + python -m nose + rm -rf build/ + + - name: Build wheels + if: ${{env.DEPLOY == 'True'}} + env: + CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" + CIBW_SKIP: "*-win32 *-manylinux_i686" + CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 + uses: joerick/cibuildwheel@v1.11.0 + + - name: Build source + if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} + run: | + python setup.py sdist --dist-dir=wheelhouse + + - name: Release to pypi + if: ${{env.DEPLOY == 'True'}} + run: | + python -m pip install --upgrade twine + twine check wheelhouse/* + twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD + + - name: Upload artifacts to github + if: ${{env.DEPLOY == 'True'}} + uses: actions/upload-artifact@v1 + with: + name: wheels + path: ./wheelhouse diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b897fde..0000000 --- a/.travis.yml +++ /dev/null @@ -1,46 +0,0 @@ -# mash of travis scripts from -# https://github.com/joerick/cibuildwheel/blob/master/.travis.yml -# https://github.com/pypa/python-manylinux-demo/blob/master/.travis.yml -notifications: - email: false - -deploy: - provider: releases - api_key: - secure: VVUpxWmC7VkGcbniATyHZdxo7nMHqT7wYwzJ/lmvDm9IEhxwp2V9Fmra8J1oCRyBhVzbwqSsJzlAlffFu8DtneM6Ye0v4tWQr7Dt0XLICT+B0jz+YGeAQwsDljhNPQ5VsioDlrhoftD3gTBqKBQqMRDcSNwTISPUKZVcvDErBGU= - file_glob: true - file: wheelhouse/ecos-*.whl - skip_cleanup: true - on: - branch: master - tags: true - -matrix: - include: - - sudo: required - services: - - docker - env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 - - sudo: required - services: - - docker - env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 - PRE_CMD=linux32 - - sudo: required - arch: arm64-graviton2 - group: edge - virt: lxd - services: - - docker - env: DOCKER_IMAGE=quay.io/pypa/manylinux2014_aarch64 - - os: osx - env: PYTHON=python3 - -install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull $DOCKER_IMAGE; fi - -script: - - make version - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --rm -v `pwd`:/io $DOCKER_IMAGE $PRE_CMD /io/travis/build-wheels.sh; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./travis/build-osx-wheels.sh; fi - - ls wheelhouse/ diff --git a/README.md b/README.md index 3bd93a7..bee431a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Python Wrapper for Embedded Conic Solver (ECOS) -[![Build Status](https://travis-ci.org/embotech/ecos-python.svg?branch=master)](https://travis-ci.org/embotech/ecos-python) -[![Build Status](https://ci.appveyor.com/api/projects/status/78aatn417av1ul5u?svg=true)](https://ci.appveyor.com/project/echu/ecos-python) +[![Build Status](http://github.com/embotech/ecos-python/workflows/build/badge.svg?event=push)](https://github.com/embotech/ecos-python/actions/workflows/build.yml) + **Visit www.embotech.com/ECOS for detailed information on ECOS.** @@ -106,16 +106,18 @@ Here is a small [example](http://www.cvxpy.org/en/latest/tutorial/advanced/index.html#solve-method-options) from the CVXPY tutorial: -``` +```py +import cvxpy as cp + # Solving a problem with different solvers. -x = Variable(2) -obj = Minimize(norm(x, 2) + norm(x, 1)) +x = cp.Variable(2) +obj = cp.Minimize(cp.norm(x, 2) + cp.norm(x, 1)) constraints = [x >= 2] -prob = Problem(obj, constraints) +prob = cp.Problem(obj, constraints) # Solve with ECOS. -prob.solve(solver=ECOS) -print "optimal value with ECOS:", prob.value +prob.solve(solver=cp.ECOS) +print("optimal value with ECOS:", prob.value) ``` ## ECOS Versioning @@ -123,7 +125,7 @@ The Python module contains two version numbers: 1. `ecos.__version__`: This is the version of the Python wrapper for ECOS -2. `ecos__solver_version__`: This is the version of the underlying ECOS +2. `ecos.__solver_version__`: This is the version of the underlying ECOS solver These two version numbers should typically agree, but they might not diff --git a/RELEASE.md b/RELEASE.md deleted file mode 100644 index 7c0a280..0000000 --- a/RELEASE.md +++ /dev/null @@ -1,5 +0,0 @@ -# How to make a release -1. Create a new tag on `master` -2. Push to github -3. Download artifacts from Travis and Appveyor -4. Upload to pypi diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 0cdc7da..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,62 +0,0 @@ -# Attempts to build ECOS in Python 2 and Python 3 on Windows -# -# https://packaging.python.org/guides/supporting-windows-using-appveyor/ -environment: - matrix: - - PYTHON: "C:\\Python27" - - PYTHON: "C:\\Python34" - - PYTHON: "C:\\Python35" - - PYTHON: "C:\\Python36" - - PYTHON: "C:\\Python37" - - PYTHON: "C:\\Python38" - - PYTHON: "C:\\Python39" - #- PYTHON: "C:\\Python27-x64" - - PYTHON: "C:\\Python34-x64" - DISTUTILS_USE_SDK: "1" - - PYTHON: "C:\\Python35-x64" - - PYTHON: "C:\\Python36-x64" - - PYTHON: "C:\\Python37-x64" - - PYTHON: "C:\\Python38-x64" - - PYTHON: "C:\\Python39-x64" - -install: - # initialize the submodule - - git submodule update --init --recursive - - # store version into file and use file to set envvar because i don't - # know windows - - git describe --tags --always --dirty=.dirty | sed 's/v\(.*\)/\1/' | sed 's/\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\(rc[0-9]*\)\{0,1\}-\([0-9][0-9]*\)-\(g.*\)/\1\2.dev\3+\4/' > _version - - set /p TAG= < _version - - ECHO __version__="%TAG%" > src\ecos\version.py - - type src\ecos\version.py - - - ECHO "Filesystem root:" - - ps: "ls \"C:/\"" - - - ECHO "Installed SDKs:" - - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\"" - - # install needed dependencies, and pre-install numpy, scipy - - "%PYTHON%\\python.exe -m pip install wheel numpy scipy" - -build: false # Not a C# project, build stuff at the test step instead. - -test_script: - # Build the compiled extension and run the project tests - - ".\\appveyor\\build.cmd %PYTHON%\\python.exe setup.py test" - -after_test: - - ".\\appveyor\\build.cmd %PYTHON%\\python.exe setup.py bdist_wheel" - -artifacts: - # Archive the generated wheel package in the ci.appveyor.com build report. - - path: 'dist\*' - -deploy: - provider: GitHub - description: '' - auth_token: - secure: xJkbMnyaWoKo0ttfZh5Wx3uBYU5/SDYJvQcMWJABKJ3DURaB4oySImDVDR73s+Op - artifact: /.*\.whl/ - on: - appveyor_repo_tag: true diff --git a/appveyor/build.cmd b/appveyor/build.cmd deleted file mode 100644 index 23df2b6..0000000 --- a/appveyor/build.cmd +++ /dev/null @@ -1,21 +0,0 @@ -@echo off -:: To build extensions for 64 bit Python 3, we need to configure environment -:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of: -:: MS Windows SDK for Windows 7 and .NET Framework 4 -:: -:: More details at: -:: https://github.com/cython/cython/wiki/CythonExtensionsOnWindows - -IF "%DISTUTILS_USE_SDK%"=="1" ( - ECHO Configuring environment to build with MSVC on a 64bit architecture - ECHO Using Windows SDK 7.1 - "C:\Program Files\Microsoft SDKs\Windows\v7.1\Setup\WindowsSdkVer.exe" -q -version:v7.1 - CALL "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release - SET MSSdk=1 - REM Need the following to allow tox to see the SDK compiler - SET TOX_TESTENV_PASSENV=DISTUTILS_USE_SDK MSSdk INCLUDE LIB -) ELSE ( - ECHO Using default MSVC build environment -) - -CALL %* diff --git a/setup.py b/setup.py index ff1dec1..f00520c 100644 --- a/setup.py +++ b/setup.py @@ -60,19 +60,9 @@ def finalize_options(self): import numpy self.include_dirs.append(numpy.get_include()) -try: - # execute the version file in src/ecos/version.py - version = {} - with open(os.path.join("src", "ecos", "version.py")) as fp: - exec(fp.read(), version) -except Exception as e: - print("Please run `make version` before running setup.py.") - raise e - - setup( name = 'ecos', - version = version['__version__'], + version = '2.0.8', # point to README.md file instead of plain-text readme author = 'Alexander Domahidi, Eric Chu, Han Wang, Santiago Akle', author_email = 'domahidi@embotech.com, echu@cs.stanford.edu, hanwang2@stanford.edu, tiagoakle@gmail.com', diff --git a/travis/build-osx-wheels.sh b/travis/build-osx-wheels.sh deleted file mode 100755 index 1ec26b8..0000000 --- a/travis/build-osx-wheels.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -e -x - -# Compile wheels -$PYTHON -m pip install nose coverage --user -$PYTHON -m pip wheel . -w wheelhouse/ - -$PYTHON -m pip install ecos --no-index -f wheelhouse --user -$PYTHON -m nose --with-cover --cover-package=ecos src/test_interface.py src/test_interface_bb.py diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh deleted file mode 100755 index adecdb1..0000000 --- a/travis/build-wheels.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -set -e -x - -# Install a system package required by our library -#yum install -y atlas-devel - -if [ $(uname -m) == "aarch64" ]; then - yum install -y blas-devel lapack-devel -fi -# Compile wheels -for PYBIN in /opt/python/*/bin; do - "${PYBIN}/pip" install nose coverage #-r /io/dev-requirements.txt - "${PYBIN}/pip" wheel /io/ -w wheelhouse/ -done - -# Bundle external shared libraries into the wheels -for whl in wheelhouse/ecos-*.whl; do - auditwheel repair "$whl" -w /io/wheelhouse/ -done - -# Move remaining wheels (numpy, scipy) into location -for whl in wheelhouse/numpy*.whl; do - mv $whl /io/$whl -done - -for whl in wheelhouse/scipy*.whl; do - mv $whl /io/$whl -done - - -# Install packages and test -for PYBIN in /opt/python/*/bin/; do - "${PYBIN}/pip" install ecos --no-index -f /io/wheelhouse - (cd "$HOME"; "${PYBIN}/nosetests" --with-cover --cover-package=ecos /io/src/test_interface.py /io/src/test_interface_bb.py) -done From 42908eaf96152c11488ac82fc6535aee2587cb77 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sat, 11 Dec 2021 14:48:33 -0800 Subject: [PATCH 13/79] Create main.yml Trying to enable github actions. --- .github/workflows/main.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..f937a06 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,36 @@ +# This is a basic workflow to help you get started with Actions + +name: CI + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the master branch + push: + branches: [ master ] + pull_request: + branches: [ master ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + # Runs a single command using the runners shell + - name: Run a one-line script + run: echo Hello, world! + + # Runs a set of commands using the runners shell + - name: Run a multi-line script + run: | + echo Add other actions to build, + echo test, and deploy your project. From b55ce7c0fc88a61f3e45b246621b53b300fcb5ec Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sat, 11 Dec 2021 17:20:38 -0800 Subject: [PATCH 14/79] removing fake workflow --- .github/workflows/main.yml | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index f937a06..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,36 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: CI - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the master branch - push: - branches: [ master ] - pull_request: - branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - # Runs a single command using the runners shell - - name: Run a one-line script - run: echo Hello, world! - - # Runs a set of commands using the runners shell - - name: Run a multi-line script - run: | - echo Add other actions to build, - echo test, and deploy your project. From 0eb4350ec8f1699a479c883c8e9f61f10e57b1a6 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sat, 11 Dec 2021 17:26:12 -0800 Subject: [PATCH 15/79] Force deploy --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 473d5ea..69fcfb9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: rm -rf build/ - name: Build wheels - if: ${{env.DEPLOY == 'True'}} + if: ${{'True' == 'True'}} env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" CIBW_SKIP: "*-win32 *-manylinux_i686" @@ -90,19 +90,19 @@ jobs: uses: joerick/cibuildwheel@v1.11.0 - name: Build source - if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} + if: ${{'True' == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} run: | python setup.py sdist --dist-dir=wheelhouse - name: Release to pypi - if: ${{env.DEPLOY == 'True'}} + if: ${{'True' == 'True'}} run: | python -m pip install --upgrade twine twine check wheelhouse/* twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD - name: Upload artifacts to github - if: ${{env.DEPLOY == 'True'}} + if: ${{'True' == 'True'}} uses: actions/upload-artifact@v1 with: name: wheels From 795a78a19e570360d2166c3b5f29e0670847328f Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sat, 11 Dec 2021 17:33:00 -0800 Subject: [PATCH 16/79] back to normal --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69fcfb9..473d5ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: rm -rf build/ - name: Build wheels - if: ${{'True' == 'True'}} + if: ${{env.DEPLOY == 'True'}} env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" CIBW_SKIP: "*-win32 *-manylinux_i686" @@ -90,19 +90,19 @@ jobs: uses: joerick/cibuildwheel@v1.11.0 - name: Build source - if: ${{'True' == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} + if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} run: | python setup.py sdist --dist-dir=wheelhouse - name: Release to pypi - if: ${{'True' == 'True'}} + if: ${{env.DEPLOY == 'True'}} run: | python -m pip install --upgrade twine twine check wheelhouse/* twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD - name: Upload artifacts to github - if: ${{'True' == 'True'}} + if: ${{env.DEPLOY == 'True'}} uses: actions/upload-artifact@v1 with: name: wheels From 83ce38bcc9210b7f22d3c9f892221919a328ae4d Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Fri, 24 Dec 2021 10:35:23 -0800 Subject: [PATCH 17/79] try py 3.10 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 473d5ea..8d63f06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-18.04, macos-10.15, windows-2019 ] - python-version: [3.6, 3.7, 3.9 ] + python-version: [3.6, 3.7, 3.9, 3.10 ] include: - os: ubuntu-18.04 python-version: 3.8 From 8c0a7eb95ded8feab4ac89133d5282a84abc806a Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Fri, 24 Dec 2021 10:42:44 -0800 Subject: [PATCH 18/79] try again --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8d63f06..1caba57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-18.04, macos-10.15, windows-2019 ] - python-version: [3.6, 3.7, 3.9, 3.10 ] + python-version: [3.6, 3.7, 3.9, 3.10.* ] include: - os: ubuntu-18.04 python-version: 3.8 From 970a04101bacdf73bd4b7c64c2d163a3217254c2 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Fri, 24 Dec 2021 10:45:49 -0800 Subject: [PATCH 19/79] try again --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1caba57..05eda3c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,7 +62,7 @@ jobs: run: | if [[ "$PYTHON_VERSION" == "3.6" ]] || [[ "$PYTHON_VERSION" == "3.7" ]] || [[ "$PYTHON_VERSION" == "3.8" ]]; then conda install scipy=1.3 numpy=1.16 nose - elif [[ "$PYTHON_VERSION" == "3.9" ]]; then + elif [[ "$PYTHON_VERSION" == "3.9" ]] || [[ "$PYTHON_VERSION" == "3.10.*" ]]; then conda install scipy=1.5 numpy=1.19 nose fi if [[ "$RUNNER_OS" == "macOS" ]]; then From f08c6588d40b9f7982a560e62e9aa547c479d627 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Fri, 24 Dec 2021 10:50:31 -0800 Subject: [PATCH 20/79] up scipy numpy --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 05eda3c..d3f77c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,9 +62,12 @@ jobs: run: | if [[ "$PYTHON_VERSION" == "3.6" ]] || [[ "$PYTHON_VERSION" == "3.7" ]] || [[ "$PYTHON_VERSION" == "3.8" ]]; then conda install scipy=1.3 numpy=1.16 nose - elif [[ "$PYTHON_VERSION" == "3.9" ]] || [[ "$PYTHON_VERSION" == "3.10.*" ]]; then + elif [[ "$PYTHON_VERSION" == "3.9" ]]; then conda install scipy=1.5 numpy=1.19 nose fi + elif [[ "$PYTHON_VERSION" == "3.10.*" ]]; then + conda install scipy=1.7 numpy=1.21 nose + fi if [[ "$RUNNER_OS" == "macOS" ]]; then sudo rm -rf /Library/Developer/CommandLineTools fi From 680a8bd4b64e9ee929af3de832b090f2cb345751 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Fri, 24 Dec 2021 10:51:41 -0800 Subject: [PATCH 21/79] syntax error --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3f77c8..b355c91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,6 @@ jobs: conda install scipy=1.3 numpy=1.16 nose elif [[ "$PYTHON_VERSION" == "3.9" ]]; then conda install scipy=1.5 numpy=1.19 nose - fi elif [[ "$PYTHON_VERSION" == "3.10.*" ]]; then conda install scipy=1.7 numpy=1.21 nose fi From ab80f61f4e5490d8d5d64b4056a418a3b1e3d19d Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Fri, 24 Dec 2021 18:08:59 -0800 Subject: [PATCH 22/79] rename 3.10 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b355c91..1cccabf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-18.04, macos-10.15, windows-2019 ] - python-version: [3.6, 3.7, 3.9, 3.10.* ] + python-version: [3.6, 3.7, 3.9, "3.10" ] include: - os: ubuntu-18.04 python-version: 3.8 @@ -64,7 +64,7 @@ jobs: conda install scipy=1.3 numpy=1.16 nose elif [[ "$PYTHON_VERSION" == "3.9" ]]; then conda install scipy=1.5 numpy=1.19 nose - elif [[ "$PYTHON_VERSION" == "3.10.*" ]]; then + elif [[ "$PYTHON_VERSION" == "3.10" ]]; then conda install scipy=1.7 numpy=1.21 nose fi if [[ "$RUNNER_OS" == "macOS" ]]; then From 3bd083219f594b35c1248381dcc3da562914cd6c Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sat, 25 Dec 2021 12:24:27 -0800 Subject: [PATCH 23/79] test build wheel --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1cccabf..025bdf8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,12 +84,12 @@ jobs: rm -rf build/ - name: Build wheels - if: ${{env.DEPLOY == 'True'}} + if: ${{'True' == 'True' || env.DEPLOY == 'True'}} env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" CIBW_SKIP: "*-win32 *-manylinux_i686" CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 - uses: joerick/cibuildwheel@v1.11.0 + uses: joerick/cibuildwheel@v2.3.1 - name: Build source if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} From 5fb68e131d88ecd59b6e3a91ab7bd1c6ecfd397a Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sun, 26 Dec 2021 13:08:19 -0800 Subject: [PATCH 24/79] trying new ecos workflow --- .github/workflows/build.yml | 109 ++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 53 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 025bdf8..d62cd99 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,23 +26,10 @@ jobs: fail-fast: false matrix: os: [ ubuntu-18.04, macos-10.15, windows-2019 ] - python-version: [3.6, 3.7, 3.9, "3.10" ] - include: - - os: ubuntu-18.04 - python-version: 3.8 - single_action_config: "True" - - os: macos-10.15 - python-version: 3.8 - - os: windows-2019 - python-version: 3.8 + python-version: [3.6, 3.7, 3.9, 3.8, "3.10" ] env: - RUNNER_OS: ${{ matrix.os }} PYTHON_VERSION: ${{ matrix.python-version }} - SINGLE_ACTION_CONFIG: "${{ matrix.single_action_config == 'True' && 'True' || 'False' }}" - PYPI_SERVER: ${{ secrets.PYPI_SERVER }} - PYPI_USER: ${{ secrets.PYPI_USER }} - PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} steps: - uses: actions/checkout@v2 @@ -53,12 +40,7 @@ jobs: auto-update-conda: true python-version: ${{ matrix.python-version }} channels: conda-forge,anaconda - - name: Set Additional Envs - run: | - echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV - echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - - - name: Install dependencies + - name: Install run: | if [[ "$PYTHON_VERSION" == "3.6" ]] || [[ "$PYTHON_VERSION" == "3.7" ]] || [[ "$PYTHON_VERSION" == "3.8" ]]; then conda install scipy=1.3 numpy=1.16 nose @@ -67,45 +49,66 @@ jobs: elif [[ "$PYTHON_VERSION" == "3.10" ]]; then conda install scipy=1.7 numpy=1.21 nose fi - if [[ "$RUNNER_OS" == "macOS" ]]; then - sudo rm -rf /Library/Developer/CommandLineTools - fi - - - name: Downgrade xcode - if: runner.os == 'macOS' - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: '10.3' + make install - name: Test run: | - make install python -m nose rm -rf build/ - - name: Build wheels - if: ${{'True' == 'True' || env.DEPLOY == 'True'}} - env: - CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" - CIBW_SKIP: "*-win32 *-manylinux_i686" - CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 - uses: joerick/cibuildwheel@v2.3.1 + build_wheels: + needs: build - - name: Build source - if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} - run: | - python setup.py sdist --dist-dir=wheelhouse + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-18.04, macos-10.15, windows-2019 ] + python-version: [ 3.6, 3.7, 3.8, 3.9, "3.10" ] - - name: Release to pypi - if: ${{env.DEPLOY == 'True'}} - run: | - python -m pip install --upgrade twine - twine check wheelhouse/* - twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD + env: + RUNNER_OS: ${{ matrix.os }} + PYTHON_VERSION: ${{ matrix.python-version }} + PYPI_SERVER: ${{ secrets.PYPI_SERVER }} + PYPI_USER: ${{ secrets.PYPI_USER }} + PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - - name: Upload artifacts to github - if: ${{env.DEPLOY == 'True'}} - uses: actions/upload-artifact@v1 - with: - name: wheels - path: ./wheelhouse + steps: + + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Set Additional Envs + shell: bash + run: | + echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV + echo "DEPLOY_PYPI_SOURCE=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + + - name: Build wheels + if: ${{'True' == 'True' || env.DEPLOY == 'True'}} + env: + CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" + CIBW_SKIP: "*-win32 *-manylinux_i686" + CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 + uses: joerick/cibuildwheel@v2.3.1 + + - name: Build source + if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} + run: | + python setup.py sdist --dist-dir=wheelhouse + + - name: Release to pypi + if: ${{env.DEPLOY == 'True'}} + run: | + python -m pip install --upgrade twine + twine check wheelhouse/* + twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD + + - name: Upload artifacts to github + if: ${{env.DEPLOY == 'True'}} + uses: actions/upload-artifact@v1 + with: + name: wheels + path: ./wheelhouse From d60bd4df54041859257fb93c438953bb8b31ca66 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sun, 26 Dec 2021 13:11:15 -0800 Subject: [PATCH 25/79] try again --- .github/workflows/build.yml | 96 ++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d62cd99..3c1dc46 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,59 +56,59 @@ jobs: python -m nose rm -rf build/ - build_wheels: - needs: build + build_wheels: + needs: build - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ ubuntu-18.04, macos-10.15, windows-2019 ] - python-version: [ 3.6, 3.7, 3.8, 3.9, "3.10" ] + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-18.04, macos-10.15, windows-2019 ] + python-version: [ 3.6, 3.7, 3.8, 3.9, "3.10" ] - env: - RUNNER_OS: ${{ matrix.os }} - PYTHON_VERSION: ${{ matrix.python-version }} - PYPI_SERVER: ${{ secrets.PYPI_SERVER }} - PYPI_USER: ${{ secrets.PYPI_USER }} - PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + env: + RUNNER_OS: ${{ matrix.os }} + PYTHON_VERSION: ${{ matrix.python-version }} + PYPI_SERVER: ${{ secrets.PYPI_SERVER }} + PYPI_USER: ${{ secrets.PYPI_USER }} + PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - steps: + steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Set Additional Envs - shell: bash - run: | - echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV - echo "DEPLOY_PYPI_SOURCE=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Set Additional Envs + shell: bash + run: | + echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV + echo "DEPLOY_PYPI_SOURCE=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - - name: Build wheels - if: ${{'True' == 'True' || env.DEPLOY == 'True'}} - env: - CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" - CIBW_SKIP: "*-win32 *-manylinux_i686" - CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 - uses: joerick/cibuildwheel@v2.3.1 + - name: Build wheels + if: ${{'True' == 'True' || env.DEPLOY == 'True'}} + env: + CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" + CIBW_SKIP: "*-win32 *-manylinux_i686" + CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 + uses: joerick/cibuildwheel@v2.3.1 - - name: Build source - if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} - run: | - python setup.py sdist --dist-dir=wheelhouse + - name: Build source + if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} + run: | + python setup.py sdist --dist-dir=wheelhouse - - name: Release to pypi - if: ${{env.DEPLOY == 'True'}} - run: | - python -m pip install --upgrade twine - twine check wheelhouse/* - twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD + - name: Release to pypi + if: ${{env.DEPLOY == 'True'}} + run: | + python -m pip install --upgrade twine + twine check wheelhouse/* + twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD - - name: Upload artifacts to github - if: ${{env.DEPLOY == 'True'}} - uses: actions/upload-artifact@v1 - with: - name: wheels - path: ./wheelhouse + - name: Upload artifacts to github + if: ${{env.DEPLOY == 'True'}} + uses: actions/upload-artifact@v1 + with: + name: wheels + path: ./wheelhouse From e2daaff426ecfae788e50bca15f34ec4a286d3ab Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sun, 26 Dec 2021 13:14:31 -0800 Subject: [PATCH 26/79] downgrade xcode --- .github/workflows/build.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c1dc46..4c0673c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,10 +49,19 @@ jobs: elif [[ "$PYTHON_VERSION" == "3.10" ]]; then conda install scipy=1.7 numpy=1.21 nose fi - make install + if [[ "$RUNNER_OS" == "macOS" ]]; then + sudo rm -rf /Library/Developer/CommandLineTools + fi + + - name: Downgrade xcode + if: runner.os == 'macOS' + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '10.3' - name: Test run: | + make install python -m nose rm -rf build/ @@ -111,4 +120,4 @@ jobs: uses: actions/upload-artifact@v1 with: name: wheels - path: ./wheelhouse + path: ./wheelhouse \ No newline at end of file From 9ed01c758c93fc51ead6fab5e67cbdb61b8f5052 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sun, 26 Dec 2021 13:29:37 -0800 Subject: [PATCH 27/79] checkout submodule --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c0673c..49f69a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,6 +85,8 @@ jobs: steps: - uses: actions/checkout@v2 + with: + submodules: recursive - uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} From b60aa1a32a35d26a7bdd462e42e670fd61555efb Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sun, 26 Dec 2021 13:46:56 -0800 Subject: [PATCH 28/79] downgrade xcode in build wheels --- .github/workflows/build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49f69a6..d985df6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,6 +97,18 @@ jobs: echo "DEPLOY_PYPI_SOURCE=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + - name: Remove Xcode + run: | + if [[ "$RUNNER_OS" == "macOS" ]]; then + sudo rm -rf /Library/Developer/CommandLineTools + fi + + - name: Downgrade xcode + if: runner.os == 'macOS' + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '10.3' + - name: Build wheels if: ${{'True' == 'True' || env.DEPLOY == 'True'}} env: From 49191923cafa7b85d2545e4bc4c3bbe72b48b889 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sun, 26 Dec 2021 14:11:18 -0800 Subject: [PATCH 29/79] Try again for windows --- .github/workflows/build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d985df6..4989b62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,19 +98,18 @@ jobs: echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - name: Remove Xcode + if: runner.os == 'macOS' run: | - if [[ "$RUNNER_OS" == "macOS" ]]; then - sudo rm -rf /Library/Developer/CommandLineTools - fi + sudo rm -rf /Library/Developer/CommandLineTools - - name: Downgrade xcode + - name: Downgrade Xcode if: runner.os == 'macOS' uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: '10.3' - name: Build wheels - if: ${{'True' == 'True' || env.DEPLOY == 'True'}} + if: ${{'True' == 'True'}} env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" CIBW_SKIP: "*-win32 *-manylinux_i686" From cb45bff3a6b3e3436a3002096ebe11b417741892 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sun, 26 Dec 2021 14:37:08 -0800 Subject: [PATCH 30/79] upload 3.10 --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4989b62..9af7e49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -117,19 +117,20 @@ jobs: uses: joerick/cibuildwheel@v2.3.1 - name: Build source - if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} + if: ${{'True' == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} run: | python setup.py sdist --dist-dir=wheelhouse - name: Release to pypi - if: ${{env.DEPLOY == 'True'}} + if: ${{'True' == 'True'}} + shell: bash run: | python -m pip install --upgrade twine twine check wheelhouse/* twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD - name: Upload artifacts to github - if: ${{env.DEPLOY == 'True'}} + if: ${{'True' == 'True'}} uses: actions/upload-artifact@v1 with: name: wheels From 147f387d0aca2a5ed1e83731f638d0ed48bcc810 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sun, 26 Dec 2021 15:09:42 -0800 Subject: [PATCH 31/79] back to normal --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9af7e49..6db5330 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,7 +109,7 @@ jobs: xcode-version: '10.3' - name: Build wheels - if: ${{'True' == 'True'}} + if: ${{env.DEPLOY == 'True'}} env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" CIBW_SKIP: "*-win32 *-manylinux_i686" @@ -117,12 +117,12 @@ jobs: uses: joerick/cibuildwheel@v2.3.1 - name: Build source - if: ${{'True' == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} + if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} run: | python setup.py sdist --dist-dir=wheelhouse - name: Release to pypi - if: ${{'True' == 'True'}} + if: ${{env.DEPLOY == 'True'}} shell: bash run: | python -m pip install --upgrade twine @@ -130,7 +130,7 @@ jobs: twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD - name: Upload artifacts to github - if: ${{'True' == 'True'}} + if: ${{env.DEPLOY == 'True'}} uses: actions/upload-artifact@v1 with: name: wheels From 230f45caba41627dd788723f9e827fbbd4df3ed4 Mon Sep 17 00:00:00 2001 From: Rob Huisman Date: Tue, 4 Jan 2022 17:12:01 +0100 Subject: [PATCH 32/79] add pyproject.toml build-system --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..bbf49ad --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,2 @@ +[build-system] +requires = ["wheel", "setuptools", "oldest-supported-numpy"] From 5ec986e434c86fe1c94e27737a8115ce9846b27d Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 4 Jan 2022 09:14:43 -0800 Subject: [PATCH 33/79] =?UTF-8?q?Bump=20version:=202.0.8=20=E2=86=92=202.0?= =?UTF-8?q?.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 3 +-- setup.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 78e9a26..42bf2ba 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,6 @@ [bumpversion] -current_version = 2.0.8 +current_version = 2.0.9 commit = True tag = True [bumpversion:file:setup.py] - diff --git a/setup.py b/setup.py index f00520c..6df8826 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ def finalize_options(self): setup( name = 'ecos', - version = '2.0.8', + version = '2.0.9', # point to README.md file instead of plain-text readme author = 'Alexander Domahidi, Eric Chu, Han Wang, Santiago Akle', author_email = 'domahidi@embotech.com, echu@cs.stanford.edu, hanwang2@stanford.edu, tiagoakle@gmail.com', From 1b9f2e973e827be4948c781aefebe99287b4a0f3 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 4 Jan 2022 09:49:02 -0800 Subject: [PATCH 34/79] upload source --- .github/workflows/build.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6db5330..6f3de1b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,7 +73,15 @@ jobs: fail-fast: false matrix: os: [ ubuntu-18.04, macos-10.15, windows-2019 ] - python-version: [ 3.6, 3.7, 3.8, 3.9, "3.10" ] + python-version: [ 3.6, 3.7, 3.9, "3.10" ] + include: + - os: ubuntu-18.04 + python-version: 3.8 + single_action_config: "True" + - os: macos-10.15 + python-version: 3.8 + - os: windows-2019 + python-version: 3.8 env: RUNNER_OS: ${{ matrix.os }} @@ -117,12 +125,12 @@ jobs: uses: joerick/cibuildwheel@v2.3.1 - name: Build source - if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} + if: ${{'True' == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} run: | python setup.py sdist --dist-dir=wheelhouse - name: Release to pypi - if: ${{env.DEPLOY == 'True'}} + if: ${{'True' == 'True'}} shell: bash run: | python -m pip install --upgrade twine From 96278c19f3dbebbcf5117dbcebfa7dc8486e87a7 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 4 Jan 2022 11:28:09 -0800 Subject: [PATCH 35/79] no musllinux --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f3de1b..309d83e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,6 +86,7 @@ jobs: env: RUNNER_OS: ${{ matrix.os }} PYTHON_VERSION: ${{ matrix.python-version }} + SINGLE_ACTION_CONFIG: "${{ matrix.single_action_config == 'True' }}" PYPI_SERVER: ${{ secrets.PYPI_SERVER }} PYPI_USER: ${{ secrets.PYPI_USER }} PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} @@ -120,7 +121,7 @@ jobs: if: ${{env.DEPLOY == 'True'}} env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" - CIBW_SKIP: "*-win32 *-manylinux_i686" + CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*"" CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 uses: joerick/cibuildwheel@v2.3.1 From 99bb15e56dc1dbda5ca79baeac7fb7a4f925011c Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 4 Jan 2022 11:29:29 -0800 Subject: [PATCH 36/79] fix yaml error --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 309d83e..acc01db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,7 +121,7 @@ jobs: if: ${{env.DEPLOY == 'True'}} env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" - CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*"" + CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*" CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 uses: joerick/cibuildwheel@v2.3.1 From b13b386152d787fa0b270b273ee8cc80254b7e1c Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 4 Jan 2022 11:39:06 -0800 Subject: [PATCH 37/79] back to normal --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index acc01db..c66fd1b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -126,12 +126,12 @@ jobs: uses: joerick/cibuildwheel@v2.3.1 - name: Build source - if: ${{'True' == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} + if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} run: | python setup.py sdist --dist-dir=wheelhouse - name: Release to pypi - if: ${{'True' == 'True'}} + if: ${{env.DEPLOY == 'True'}} shell: bash run: | python -m pip install --upgrade twine From 34efa310e718056fb552ee7741f0602c438e293a Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 4 Jan 2022 14:03:11 -0800 Subject: [PATCH 38/79] try no version --- src/ecos/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ecos/__init__.py b/src/ecos/__init__.py index 6342653..1477a94 100644 --- a/src/ecos/__init__.py +++ b/src/ecos/__init__.py @@ -1,2 +1 @@ from .ecos import solve, __solver_version__ -from .version import __version__ From 4bcd65bacb231383f8cc53605451ffdf92a26d71 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 4 Jan 2022 14:17:11 -0800 Subject: [PATCH 39/79] add version file back in --- .bumpversion.cfg | 3 +-- src/ecos/__init__.py | 1 + src/ecos/version.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 src/ecos/version.py diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 42bf2ba..6046cb8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,6 +1,5 @@ [bumpversion] current_version = 2.0.9 +files = setup.py ecos/version.py commit = True tag = True - -[bumpversion:file:setup.py] diff --git a/src/ecos/__init__.py b/src/ecos/__init__.py index 1477a94..6342653 100644 --- a/src/ecos/__init__.py +++ b/src/ecos/__init__.py @@ -1 +1,2 @@ from .ecos import solve, __solver_version__ +from .version import __version__ diff --git a/src/ecos/version.py b/src/ecos/version.py new file mode 100644 index 0000000..95466ea --- /dev/null +++ b/src/ecos/version.py @@ -0,0 +1 @@ +__version__="2.0.9" \ No newline at end of file From 78c305258d92d67c4e6321cc5136ad7fb334d8d1 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 4 Jan 2022 14:21:40 -0800 Subject: [PATCH 40/79] change ecos commit --- ecos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecos b/ecos index 3b98fe0..8bb0d2a 160000 --- a/ecos +++ b/ecos @@ -1 +1 @@ -Subproject commit 3b98fe0376ceeeb8310a06694b0a84ac59920f3f +Subproject commit 8bb0d2a7b39607cf464efb8087bfcbb4213f6176 From 6f374db27fb5d4e85ee8a0e939665a258debd73d Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 4 Jan 2022 14:27:16 -0800 Subject: [PATCH 41/79] change bumpversion --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6046cb8..3918212 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] current_version = 2.0.9 -files = setup.py ecos/version.py +files = setup.py src/ecos/version.py commit = True tag = True From 9fb383cceeb7c5c51b466e86d6bbdf827cf4b1d1 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 4 Jan 2022 14:33:47 -0800 Subject: [PATCH 42/79] ecos 2.0.10 --- ecos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecos b/ecos index 8bb0d2a..5d3aa62 160000 --- a/ecos +++ b/ecos @@ -1 +1 @@ -Subproject commit 8bb0d2a7b39607cf464efb8087bfcbb4213f6176 +Subproject commit 5d3aa62ef437e41c0314b4a16427d5d06a90b7e6 From 30a0ba91f8f39a0f517bb811cbfed88e557c3a19 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 4 Jan 2022 14:40:49 -0800 Subject: [PATCH 43/79] =?UTF-8?q?Bump=20version:=202.0.9=20=E2=86=92=202.0?= =?UTF-8?q?.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- setup.py | 2 +- src/ecos/version.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 3918212..036929a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.0.9 +current_version = 2.0.10 files = setup.py src/ecos/version.py commit = True tag = True diff --git a/setup.py b/setup.py index 6df8826..2d58636 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ def finalize_options(self): setup( name = 'ecos', - version = '2.0.9', + version = '2.0.10', # point to README.md file instead of plain-text readme author = 'Alexander Domahidi, Eric Chu, Han Wang, Santiago Akle', author_email = 'domahidi@embotech.com, echu@cs.stanford.edu, hanwang2@stanford.edu, tiagoakle@gmail.com', diff --git a/src/ecos/version.py b/src/ecos/version.py index 95466ea..23cd9d9 100644 --- a/src/ecos/version.py +++ b/src/ecos/version.py @@ -1 +1 @@ -__version__="2.0.9" \ No newline at end of file +__version__="2.0.10" \ No newline at end of file From f4502e9e84e8c1a97a4b61002489f63e47c20e89 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Mon, 13 Jun 2022 10:45:17 -0700 Subject: [PATCH 44/79] Update build.yml --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c66fd1b..fc8ec85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -122,8 +122,7 @@ jobs: env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*" - CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 - uses: joerick/cibuildwheel@v2.3.1 + uses: joerick/cibuildwheel@v2.6.1 - name: Build source if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} @@ -143,4 +142,4 @@ jobs: uses: actions/upload-artifact@v1 with: name: wheels - path: ./wheelhouse \ No newline at end of file + path: ./wheelhouse From 6c2a27cec339ea406cc6e5dd38c05f3021ebf13e Mon Sep 17 00:00:00 2001 From: phschiele Date: Wed, 31 Aug 2022 13:58:24 -0700 Subject: [PATCH 45/79] Bump runners --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc8ec85..2aafa3a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-18.04, macos-10.15, windows-2019 ] + os: [ ubuntu-20.04, macos-11, windows-2019 ] python-version: [3.6, 3.7, 3.9, 3.8, "3.10" ] env: @@ -72,13 +72,13 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-18.04, macos-10.15, windows-2019 ] + os: [ ubuntu-20.04, macos-11, windows-2019 ] python-version: [ 3.6, 3.7, 3.9, "3.10" ] include: - - os: ubuntu-18.04 + - os: ubuntu-20.04 python-version: 3.8 single_action_config: "True" - - os: macos-10.15 + - os: macos-11 python-version: 3.8 - os: windows-2019 python-version: 3.8 From 4cdc53d11e2def29d6b233dc10b6ec272ec67dc0 Mon Sep 17 00:00:00 2001 From: phschiele Date: Thu, 1 Sep 2022 08:50:51 -0700 Subject: [PATCH 46/79] Use xcode 11.7 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2aafa3a..85b7527 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,7 +57,7 @@ jobs: if: runner.os == 'macOS' uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '10.3' + xcode-version: '11.7' - name: Test run: | From b6ffa3f2a10da564dee3780647fe484562a3d871 Mon Sep 17 00:00:00 2001 From: phschiele Date: Thu, 1 Sep 2022 09:00:26 -0700 Subject: [PATCH 47/79] Try to remove xcode downgrade --- .github/workflows/build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85b7527..c0540d8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,12 +53,6 @@ jobs: sudo rm -rf /Library/Developer/CommandLineTools fi - - name: Downgrade xcode - if: runner.os == 'macOS' - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: '11.7' - - name: Test run: | make install From f2911494ccb03e43857fbb18850a425aee0d6263 Mon Sep 17 00:00:00 2001 From: phschiele Date: Thu, 1 Sep 2022 09:10:17 -0700 Subject: [PATCH 48/79] Also remove from wheel build --- .github/workflows/build.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0540d8..efd1608 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,26 +100,15 @@ jobs: echo "DEPLOY_PYPI_SOURCE=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - - name: Remove Xcode - if: runner.os == 'macOS' - run: | - sudo rm -rf /Library/Developer/CommandLineTools - - - name: Downgrade Xcode - if: runner.os == 'macOS' - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: '10.3' - - name: Build wheels - if: ${{env.DEPLOY == 'True'}} +# if: ${{env.DEPLOY == 'True'}} env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*" uses: joerick/cibuildwheel@v2.6.1 - name: Build source - if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} +# if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} run: | python setup.py sdist --dist-dir=wheelhouse @@ -129,7 +118,7 @@ jobs: run: | python -m pip install --upgrade twine twine check wheelhouse/* - twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD +# twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD - name: Upload artifacts to github if: ${{env.DEPLOY == 'True'}} From 7a46c18182953c74cdbc58382c269e41f0d55e61 Mon Sep 17 00:00:00 2001 From: phschiele Date: Thu, 1 Sep 2022 09:57:47 -0700 Subject: [PATCH 49/79] Drop 3.6 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index efd1608..fee830c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, macos-11, windows-2019 ] - python-version: [3.6, 3.7, 3.9, 3.8, "3.10" ] + python-version: [ 3.7, 3.9, 3.8, "3.10" ] env: PYTHON_VERSION: ${{ matrix.python-version }} @@ -42,7 +42,7 @@ jobs: channels: conda-forge,anaconda - name: Install run: | - if [[ "$PYTHON_VERSION" == "3.6" ]] || [[ "$PYTHON_VERSION" == "3.7" ]] || [[ "$PYTHON_VERSION" == "3.8" ]]; then + if [[ "$PYTHON_VERSION" == "3.7" ]] || [[ "$PYTHON_VERSION" == "3.8" ]]; then conda install scipy=1.3 numpy=1.16 nose elif [[ "$PYTHON_VERSION" == "3.9" ]]; then conda install scipy=1.5 numpy=1.19 nose @@ -67,7 +67,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, macos-11, windows-2019 ] - python-version: [ 3.6, 3.7, 3.9, "3.10" ] + python-version: [ 3.7, 3.9, "3.10" ] include: - os: ubuntu-20.04 python-version: 3.8 From 403e851f8249a0d0ef0ca7e3997ff16b94b219e5 Mon Sep 17 00:00:00 2001 From: phschiele Date: Thu, 1 Sep 2022 10:18:19 -0700 Subject: [PATCH 50/79] Undo testing --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fee830c..295c6a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -101,14 +101,14 @@ jobs: echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - name: Build wheels -# if: ${{env.DEPLOY == 'True'}} + if: ${{env.DEPLOY == 'True'}} env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*" uses: joerick/cibuildwheel@v2.6.1 - name: Build source -# if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} + if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} run: | python setup.py sdist --dist-dir=wheelhouse @@ -118,7 +118,7 @@ jobs: run: | python -m pip install --upgrade twine twine check wheelhouse/* -# twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD + twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD - name: Upload artifacts to github if: ${{env.DEPLOY == 'True'}} From 4440dcb7ddbd92217bc83d8916b72b61537dffbf Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Mon, 3 Oct 2022 18:10:41 +0200 Subject: [PATCH 51/79] Use np.array in test_interface_bb.py --- src/test_interface_bb.py | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/src/test_interface_bb.py b/src/test_interface_bb.py index b93b737..a4aba46 100644 --- a/src/test_interface_bb.py +++ b/src/test_interface_bb.py @@ -1,15 +1,16 @@ from __future__ import print_function import ecos import numpy as np -from scipy import * import scipy.sparse as sp c = np.array([-1., -1.]) -h = np.array([ 4., 12., 0. , 0.]) +h = np.array([ 4., 12., 0., 0.]) bool_idx = [1] -G = sp.csc_matrix( (array([2.0, 3.0, -1.0, 1.0, 4.0, -1.0]), - array([0, 1, 2, 0, 1, 3]), - array([0, 3, 6])) ) +G = sp.csc_matrix(( + np.array([2.0, 3.0, -1.0, 1.0, 4.0, -1.0]), + np.array([0, 1, 2, 0, 1, 3]), + np.array([0, 3, 6]), +)) dims = dict() dims['l'] = 4 @@ -19,11 +20,13 @@ print(sol['x']) c = np.array([-1., -1.]) -h = np.array([ 4., 12., 0. , 0.]) +h = np.array([ 4., 12., 0., 0.]) bool_idx = [] -G = sp.csc_matrix( (array([2.0, 3.0, -1.0, 1.0, 4.0, -1.0]), - array([0, 1, 2, 0, 1, 3]), - array([0, 3, 6])) ) +G = sp.csc_matrix(( + np.array([2.0, 3.0, -1.0, 1.0, 4.0, -1.0]), + np.array([0, 1, 2, 0, 1, 3]), + np.array([0, 3, 6]), +)) dims = dict() dims['l'] = 4 @@ -33,11 +36,13 @@ print(sol['x']) c = np.array([-1., -1.1]) -h = np.array([ 4., 12., 0. , 0.]) +h = np.array([ 4., 12., 0., 0.]) bool_idx = [1,0] -G = sp.csc_matrix( (array([2.0, 3.0, -1.0, 1.0, 4.0, -1.0]), - array([0, 1, 2, 0, 1, 3]), - array([0, 3, 6])) ) +G = sp.csc_matrix(( + np.array([2.0, 3.0, -1.0, 1.0, 4.0, -1.0]), + np.array([0, 1, 2, 0, 1, 3]), + np.array([0, 3, 6]), +)) dims = dict() dims['l'] = 4 @@ -50,9 +55,11 @@ c = np.array([-1., -1.5]) h = np.array([ 4., 12., 0. , 0.]) bool_idx = [1] -G = sp.csc_matrix( (array([2.0, 3.0, -1.0, 1.0, 4.0, -1.0]), - array([0, 1, 2, 0, 1, 3]), - array([0, 3, 6])) ) +G = sp.csc_matrix(( + np.array([2.0, 3.0, -1.0, 1.0, 4.0, -1.0]), + np.array([0, 1, 2, 0, 1, 3]), + np.array([0, 3, 6]), +)) dims = dict() dims['l'] = 4 From 031178fc439200e168b047788a581344822dd14f Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Sun, 20 Nov 2022 20:52:44 +0000 Subject: [PATCH 52/79] Add py311 to workflows --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 295c6a4..cbd4ccf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, macos-11, windows-2019 ] - python-version: [ 3.7, 3.9, 3.8, "3.10" ] + python-version: [ 3.7, 3.9, 3.8, "3.10", "3.11" ] env: PYTHON_VERSION: ${{ matrix.python-version }} @@ -48,6 +48,8 @@ jobs: conda install scipy=1.5 numpy=1.19 nose elif [[ "$PYTHON_VERSION" == "3.10" ]]; then conda install scipy=1.7 numpy=1.21 nose + elif [[ "$PYTHON_VERSION" == "3.11" ]]; then + conda install scipy=1.9.3 numpy=1.23.4 nose fi if [[ "$RUNNER_OS" == "macOS" ]]; then sudo rm -rf /Library/Developer/CommandLineTools @@ -67,7 +69,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, macos-11, windows-2019 ] - python-version: [ 3.7, 3.9, "3.10" ] + python-version: [ 3.7, 3.9, "3.10", "3.11" ] include: - os: ubuntu-20.04 python-version: 3.8 From 0b00ac1eedf7ce60b68b0095ffd3d99f7c6755cb Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Sun, 20 Nov 2022 20:54:23 +0000 Subject: [PATCH 53/79] Skip existing --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cbd4ccf..9ac3620 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -120,7 +120,7 @@ jobs: run: | python -m pip install --upgrade twine twine check wheelhouse/* - twine upload --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD + twine upload --skip-existing --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD - name: Upload artifacts to github if: ${{env.DEPLOY == 'True'}} From db569b7b0c5793b3893119e0f788b13e2cc059ec Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 22 Nov 2022 12:58:16 -0800 Subject: [PATCH 54/79] deploy 3.11 --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ac3620..aa1f624 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,7 +100,8 @@ jobs: run: | echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV echo "DEPLOY_PYPI_SOURCE=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + #echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + echo "DEPLOY=$( echo 'True' )" >> $GITHUB_ENV - name: Build wheels if: ${{env.DEPLOY == 'True'}} From 63b3d2669ba4c9fead65e79e29c2269d5850774d Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Wed, 23 Nov 2022 03:08:54 +0000 Subject: [PATCH 55/79] bump --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa1f624..5b8746f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*" - uses: joerick/cibuildwheel@v2.6.1 + uses: joerick/cibuildwheel@v2.11.2 - name: Build source if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} From 28295003bf32703154c17a17e278bbe4d3f6cc17 Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Wed, 23 Nov 2022 03:14:05 +0000 Subject: [PATCH 56/79] Define long description format --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2d58636..81cbfcf 100644 --- a/setup.py +++ b/setup.py @@ -63,11 +63,12 @@ def finalize_options(self): setup( name = 'ecos', version = '2.0.10', - # point to README.md file instead of plain-text readme author = 'Alexander Domahidi, Eric Chu, Han Wang, Santiago Akle', author_email = 'domahidi@embotech.com, echu@cs.stanford.edu, hanwang2@stanford.edu, tiagoakle@gmail.com', url = 'http://github.com/embotech/ecos', description = 'This is the Python package for ECOS: Embedded Cone Solver. See Github page for more information.', + long_description=open('README.md').read(), + long_description_content_type="text/markdown", license = "GPLv3", packages = ['ecos'], package_dir = {'': 'src'}, From 207a0992c7eac5dabb0613bea3ffaa26f817150d Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Wed, 23 Nov 2022 03:14:47 +0000 Subject: [PATCH 57/79] Prevent upload --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b8746f..8b5bd9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,7 +121,7 @@ jobs: run: | python -m pip install --upgrade twine twine check wheelhouse/* - twine upload --skip-existing --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD + # twine upload --skip-existing --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD - name: Upload artifacts to github if: ${{env.DEPLOY == 'True'}} From e9550e102aff410f25c6743aee8388f1cd34da5a Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 22 Nov 2022 19:54:24 -0800 Subject: [PATCH 58/79] upload --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b5bd9e..5b8746f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,7 +121,7 @@ jobs: run: | python -m pip install --upgrade twine twine check wheelhouse/* - # twine upload --skip-existing --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD + twine upload --skip-existing --repository-url $PYPI_SERVER wheelhouse/* -u $PYPI_USER -p $PYPI_PASSWORD - name: Upload artifacts to github if: ${{env.DEPLOY == 'True'}} From 1907ce464059837a77fc296bbcc22efbbf44cbb4 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Tue, 22 Nov 2022 20:26:42 -0800 Subject: [PATCH 59/79] switch back to regular deploy --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b8746f..313a266 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,8 +100,7 @@ jobs: run: | echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV echo "DEPLOY_PYPI_SOURCE=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - #echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - echo "DEPLOY=$( echo 'True' )" >> $GITHUB_ENV + echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - name: Build wheels if: ${{env.DEPLOY == 'True'}} From cafadb8aa21d5597ed7dfd535f4c30d45f44a7dc Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Sun, 18 Dec 2022 19:56:58 +0000 Subject: [PATCH 60/79] Remove two cases of np.int --- src/ecos/ecos.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ecos/ecos.py b/src/ecos/ecos.py index b6bc731..0414cc6 100644 --- a/src/ecos/ecos.py +++ b/src/ecos/ecos.py @@ -50,8 +50,8 @@ def solve(c,G,h,dims,A=None,b=None, **kwargs): if G is None: data = np.zeros((0,),dtype=np.double) - indices = np.zeros((0,),dtype=np.int) - colptr = np.zeros((n1+1,),dtype=np.int) + indices = np.zeros((0,),dtype=int) + colptr = np.zeros((n1+1,),dtype=int) h = np.zeros((0,)) else: data, indices, colptr = G.data, G.indices, G.indptr From be54a309de4846ab2d2bf27aff33fc53540857a9 Mon Sep 17 00:00:00 2001 From: Steven Diamond Date: Sun, 18 Dec 2022 12:55:05 -0800 Subject: [PATCH 61/79] Update src/ecos/ecos.py Co-authored-by: phschiele <44360364+phschiele@users.noreply.github.com> --- src/ecos/ecos.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ecos/ecos.py b/src/ecos/ecos.py index 0414cc6..c395b03 100644 --- a/src/ecos/ecos.py +++ b/src/ecos/ecos.py @@ -50,8 +50,8 @@ def solve(c,G,h,dims,A=None,b=None, **kwargs): if G is None: data = np.zeros((0,),dtype=np.double) - indices = np.zeros((0,),dtype=int) - colptr = np.zeros((n1+1,),dtype=int) + indices = np.zeros((0,),dtype=np.int64) + colptr = np.zeros((n1+1,),dtype=np.int64) h = np.zeros((0,)) else: data, indices, colptr = G.data, G.indices, G.indptr From d6ffc309f239f65e2a744641076abdb374e99f75 Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Mon, 19 Dec 2022 00:28:54 +0000 Subject: [PATCH 62/79] =?UTF-8?q?Bump=20version:=202.0.10=20=E2=86=92=202.?= =?UTF-8?q?0.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- setup.py | 2 +- src/ecos/version.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 036929a..5347f4d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.0.10 +current_version = 2.0.11 files = setup.py src/ecos/version.py commit = True tag = True diff --git a/setup.py b/setup.py index 81cbfcf..7846375 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ def finalize_options(self): setup( name = 'ecos', - version = '2.0.10', + version = '2.0.11', author = 'Alexander Domahidi, Eric Chu, Han Wang, Santiago Akle', author_email = 'domahidi@embotech.com, echu@cs.stanford.edu, hanwang2@stanford.edu, tiagoakle@gmail.com', url = 'http://github.com/embotech/ecos', diff --git a/src/ecos/version.py b/src/ecos/version.py index 23cd9d9..dfa9d1c 100644 --- a/src/ecos/version.py +++ b/src/ecos/version.py @@ -1 +1 @@ -__version__="2.0.10" \ No newline at end of file +__version__="2.0.11" \ No newline at end of file From 75f857b4f0bc8ba4d7892487c7245f97889f3299 Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Mon, 19 Dec 2022 00:30:32 +0000 Subject: [PATCH 63/79] overwrite deploy --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 313a266..cda3fab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,7 +100,8 @@ jobs: run: | echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV echo "DEPLOY_PYPI_SOURCE=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + # echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + echo "DEPLOY=$( echo 'True' )" >> $GITHUB_ENV - name: Build wheels if: ${{env.DEPLOY == 'True'}} From d4eae7a65c59d8b0e4521d9e678afd13e261898b Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Mon, 19 Dec 2022 01:05:38 +0000 Subject: [PATCH 64/79] Revert "overwrite deploy" This reverts commit 75f857b4f0bc8ba4d7892487c7245f97889f3299. --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cda3fab..313a266 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,8 +100,7 @@ jobs: run: | echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV echo "DEPLOY_PYPI_SOURCE=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - # echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - echo "DEPLOY=$( echo 'True' )" >> $GITHUB_ENV + echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - name: Build wheels if: ${{env.DEPLOY == 'True'}} From d5bfd1441d41b3292abc0645b1d7c2e63b734fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Us=C3=A1n?= Date: Thu, 22 Dec 2022 13:06:01 +0100 Subject: [PATCH 65/79] Include README.md in the manifest --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index bc0b9e3..cdd5496 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,3 +3,4 @@ graft ecos/external/amd/include graft ecos/external/ldl/include graft ecos/external/SuiteSparse_config include LICENSE +include README.md From f4a1ca6ddfec24ea3ec6c52cbe94a9ee1ebb3791 Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Fri, 23 Dec 2022 22:12:11 +0000 Subject: [PATCH 66/79] =?UTF-8?q?Bump=20version:=202.0.11=20=E2=86=92=202.?= =?UTF-8?q?0.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- setup.py | 2 +- src/ecos/version.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5347f4d..e8b6be4 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.0.11 +current_version = 2.0.12 files = setup.py src/ecos/version.py commit = True tag = True diff --git a/setup.py b/setup.py index 7846375..1cbdf6c 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ def finalize_options(self): setup( name = 'ecos', - version = '2.0.11', + version = '2.0.12', author = 'Alexander Domahidi, Eric Chu, Han Wang, Santiago Akle', author_email = 'domahidi@embotech.com, echu@cs.stanford.edu, hanwang2@stanford.edu, tiagoakle@gmail.com', url = 'http://github.com/embotech/ecos', diff --git a/src/ecos/version.py b/src/ecos/version.py index dfa9d1c..9195a40 100644 --- a/src/ecos/version.py +++ b/src/ecos/version.py @@ -1 +1 @@ -__version__="2.0.11" \ No newline at end of file +__version__="2.0.12" \ No newline at end of file From a77868bf3e366f6338731a2998db3a516fafe120 Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Fri, 23 Dec 2022 22:14:55 +0000 Subject: [PATCH 67/79] overwrite deploy --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 313a266..cda3fab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,7 +100,8 @@ jobs: run: | echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV echo "DEPLOY_PYPI_SOURCE=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + # echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV + echo "DEPLOY=$( echo 'True' )" >> $GITHUB_ENV - name: Build wheels if: ${{env.DEPLOY == 'True'}} From 7453a84d831fe2c60e12558da62adf57ff9d2c37 Mon Sep 17 00:00:00 2001 From: phschiele <44360364+phschiele@users.noreply.github.com> Date: Fri, 23 Dec 2022 22:43:01 +0000 Subject: [PATCH 68/79] Revert "overwrite deploy" This reverts commit a77868bf3e366f6338731a2998db3a516fafe120. --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cda3fab..313a266 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,8 +100,7 @@ jobs: run: | echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV echo "DEPLOY_PYPI_SOURCE=$( [[ $PYTHON_VERSION == 3.8 && $RUNNER_OS == 'macOS' ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - # echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - echo "DEPLOY=$( echo 'True' )" >> $GITHUB_ENV + echo "DEPLOY=$( [[ $GITHUB_EVENT_NAME == 'push' && $GITHUB_REF == 'refs/tags'* ]] && echo 'True' || echo 'False' )" >> $GITHUB_ENV - name: Build wheels if: ${{env.DEPLOY == 'True'}} From eef83bce2297cf168fd8e7bd9d2629caf9ffb93c Mon Sep 17 00:00:00 2001 From: Steve Jiekak Date: Mon, 8 May 2023 12:03:31 +0200 Subject: [PATCH 69/79] fix: zero initialize settings --- src/ecosmodule.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ecosmodule.c b/src/ecosmodule.c index 666b2d3..2030b02 100644 --- a/src/ecosmodule.c +++ b/src/ecosmodule.c @@ -215,8 +215,8 @@ static PyObject *csolve(PyObject* self, PyObject *args, PyObject *kwargs) long mi_iterations = -1; /* Default ECOS settings */ - settings opts_ecos; - settings_bb opts_ecos_bb; + settings opts_ecos = {0}; + settings_bb opts_ecos_bb = {0}; pwork* mywork = NULL; ecos_bb_pwork* myecos_bb_work = NULL; From a60e82cf1cc58971850fee5471d9311c501d0fcd Mon Sep 17 00:00:00 2001 From: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Date: Sun, 4 Feb 2024 22:11:56 +0000 Subject: [PATCH 70/79] Add 3.12 --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 313a266..30921f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, macos-11, windows-2019 ] - python-version: [ 3.7, 3.9, 3.8, "3.10", "3.11" ] + python-version: [ 3.7, 3.9, 3.8, "3.10", "3.11", "3.12" ] env: PYTHON_VERSION: ${{ matrix.python-version }} @@ -50,6 +50,8 @@ jobs: conda install scipy=1.7 numpy=1.21 nose elif [[ "$PYTHON_VERSION" == "3.11" ]]; then conda install scipy=1.9.3 numpy=1.23.4 nose + elif [[ "$PYTHON_VERSION" == "3.12" ]]; then + conda install scipy=1.11.2 numpy=1.26.0 nose fi if [[ "$RUNNER_OS" == "macOS" ]]; then sudo rm -rf /Library/Developer/CommandLineTools @@ -69,7 +71,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, macos-11, windows-2019 ] - python-version: [ 3.7, 3.9, "3.10", "3.11" ] + python-version: [ 3.7, 3.9, "3.10", "3.11", "3.12" ] include: - os: ubuntu-20.04 python-version: 3.8 From a5b49c6e091bee1753d74551d94262c16d13b292 Mon Sep 17 00:00:00 2001 From: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Date: Sun, 4 Feb 2024 23:08:38 +0000 Subject: [PATCH 71/79] Bumpy SciPy, update cibuildwheel --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30921f3..08fd5f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: elif [[ "$PYTHON_VERSION" == "3.11" ]]; then conda install scipy=1.9.3 numpy=1.23.4 nose elif [[ "$PYTHON_VERSION" == "3.12" ]]; then - conda install scipy=1.11.2 numpy=1.26.0 nose + conda install scipy=1.11.3 numpy=1.26.0 nose fi if [[ "$RUNNER_OS" == "macOS" ]]; then sudo rm -rf /Library/Developer/CommandLineTools @@ -109,7 +109,7 @@ jobs: env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*" - uses: joerick/cibuildwheel@v2.11.2 + uses: joerick/cibuildwheel@v2.16.5 - name: Build source if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} From 8f34f3b14acbfa160ae96467269e2366ca8f7b32 Mon Sep 17 00:00:00 2001 From: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Date: Mon, 5 Feb 2024 22:35:37 +0000 Subject: [PATCH 72/79] Move to pytest --- .github/workflows/build.yml | 12 ++-- Pipfile | 2 +- Pipfile.lock | 98 +++++++++++++++++++++---------- setup.py | 3 +- src/test_interface.py | 112 ++++++++++++------------------------ src/test_interface_bb.py | 11 +--- 6 files changed, 114 insertions(+), 124 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08fd5f1..c5ad05e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,15 +43,15 @@ jobs: - name: Install run: | if [[ "$PYTHON_VERSION" == "3.7" ]] || [[ "$PYTHON_VERSION" == "3.8" ]]; then - conda install scipy=1.3 numpy=1.16 nose + conda install scipy=1.3 numpy=1.16 pytest elif [[ "$PYTHON_VERSION" == "3.9" ]]; then - conda install scipy=1.5 numpy=1.19 nose + conda install scipy=1.5 numpy=1.19 pytest elif [[ "$PYTHON_VERSION" == "3.10" ]]; then - conda install scipy=1.7 numpy=1.21 nose + conda install scipy=1.7 numpy=1.21 pytest elif [[ "$PYTHON_VERSION" == "3.11" ]]; then - conda install scipy=1.9.3 numpy=1.23.4 nose + conda install scipy=1.9.3 numpy=1.23.4 pytest elif [[ "$PYTHON_VERSION" == "3.12" ]]; then - conda install scipy=1.11.3 numpy=1.26.0 nose + conda install scipy=1.11.3 numpy=1.26.0 pytest fi if [[ "$RUNNER_OS" == "macOS" ]]; then sudo rm -rf /Library/Developer/CommandLineTools @@ -60,7 +60,7 @@ jobs: - name: Test run: | make install - python -m nose + python -m pytest rm -rf build/ build_wheels: diff --git a/Pipfile b/Pipfile index 6854c29..bca92ed 100644 --- a/Pipfile +++ b/Pipfile @@ -4,7 +4,7 @@ verify_ssl = true name = "pypi" [dev-packages] -nose = "*" +pytest = "*" [packages] numpy = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 2904dfa..e39d698 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "c3af636b572b51c57671422722e7280a3a003233795df97e0a2dee180f12e04f" + "sha256": "01e35b99ecbe27e2ed9f2ab1d12dbee14db6e5ebafba221a324d420eefbe6f1a" }, "pipfile-spec": 6, "requires": { @@ -18,43 +18,81 @@ "default": { "numpy": { "hashes": [ - "sha256:0739146eaf4985962f07c62f7133aca89f3a600faac891ce6c7f3a1e2afe5272", - "sha256:07e21f14490324cc1160db101e9b6c1233c33985af4cb1d301dd02650fea1d7f", - "sha256:0f6a5ed0cd7ab1da11f5c07a8ecada73fc55a70ef7bb6311a4109891341d7277", - "sha256:0fd65cbbfdbf76bbf80c445d923b3accefea0fe2c2082049e0ce947c81fe1d3f", - "sha256:20cac3123d791e4bf8482a580d98d6b5969ba348b9d5364df791ba3a666b660d", - "sha256:528ce59ded2008f9e8543e0146acb3a98a9890da00adf8904b1e18c82099418b", - "sha256:56e392b7c738bd70e6f46cf48c8194d3d1dd4c5a59fae4b30c58bb6ef86e5233", - "sha256:675e0f23967ce71067d12b6944add505d5f0a251f819cfb44bdf8ee7072c090d", - "sha256:6be6b0ca705321c178c9858e5ad5611af664bbdfae1df1541f938a840a103888", - "sha256:719d914f564f35cce4dc103808f8297c807c9f0297ac183ed81ae8b5650e698e", - "sha256:768e777cc1ffdbf97c507f65975c8686ebafe0f3dc8925d02ac117acc4669ce9", - "sha256:7f76d406c6b998d6410198dcb82688dcdaec7d846aa87e263ccf52efdcfeba30", - "sha256:8c18ee4dddd5c6a811930c0a7c7947bf16387da3b394725f6063f1366311187d", - "sha256:99051e03b445117b26028623f1a487112ddf61a09a27e2d25e6bc07d37d94f25", - "sha256:a1413d06abfa942ca0553bf3bccaff5fdb36d55b84f2248e36228db871147dab", - "sha256:a7157c9ac6bddd2908c35ef099e4b643bc0e0ebb4d653deb54891d29258dd329", - "sha256:a958bf9d4834c72dee4f91a0476e7837b8a2966dc6fcfc42c421405f98d0da51", - "sha256:bb370120de6d26004358611441e07acda26840e41dfedc259d7f8cc613f96495", - "sha256:d0928076d9bd8a98de44e79b1abe50c1456e7abbb40af7ef58092086f1a6c729", - "sha256:d858423f5ed444d494b15c4cc90a206e1b8c31354c781ac7584da0d21c09c1c3", - "sha256:e6120d63b50e2248219f53302af7ec6fa2a42ed1f37e9cda2c76dbaca65036a7", - "sha256:f2b1378b63bdb581d5d7af2ec0373c8d40d651941d283a2afd7fc71184b3f570", - "sha256:facc6f925c3099ac01a1f03758100772560a0b020fb9d70f210404be08006bcb" + "sha256:02f98011ba4ab17f46f80f7f8f1c291ee7d855fcef0a5a98db80767a468c85cd", + "sha256:0b7e807d6888da0db6e7e75838444d62495e2b588b99e90dd80c3459594e857b", + "sha256:12c70ac274b32bc00c7f61b515126c9205323703abb99cd41836e8125ea0043e", + "sha256:1666f634cb3c80ccbd77ec97bc17337718f56d6658acf5d3b906ca03e90ce87f", + "sha256:18c3319a7d39b2c6a9e3bb75aab2304ab79a811ac0168a671a62e6346c29b03f", + "sha256:211ddd1e94817ed2d175b60b6374120244a4dd2287f4ece45d49228b4d529178", + "sha256:21a9484e75ad018974a2fdaa216524d64ed4212e418e0a551a2d83403b0531d3", + "sha256:39763aee6dfdd4878032361b30b2b12593fb445ddb66bbac802e2113eb8a6ac4", + "sha256:3c67423b3703f8fbd90f5adaa37f85b5794d3366948efe9a5190a5f3a83fc34e", + "sha256:46f47ee566d98849323f01b349d58f2557f02167ee301e5e28809a8c0e27a2d0", + "sha256:51c7f1b344f302067b02e0f5b5d2daa9ed4a721cf49f070280ac202738ea7f00", + "sha256:5f24750ef94d56ce6e33e4019a8a4d68cfdb1ef661a52cdaee628a56d2437419", + "sha256:697df43e2b6310ecc9d95f05d5ef20eacc09c7c4ecc9da3f235d39e71b7da1e4", + "sha256:6d45b3ec2faed4baca41c76617fcdcfa4f684ff7a151ce6fc78ad3b6e85af0a6", + "sha256:77810ef29e0fb1d289d225cabb9ee6cf4d11978a00bb99f7f8ec2132a84e0166", + "sha256:7ca4f24341df071877849eb2034948459ce3a07915c2734f1abb4018d9c49d7b", + "sha256:7f784e13e598e9594750b2ef6729bcd5a47f6cfe4a12cca13def35e06d8163e3", + "sha256:806dd64230dbbfaca8a27faa64e2f414bf1c6622ab78cc4264f7f5f028fee3bf", + "sha256:867e3644e208c8922a3be26fc6bbf112a035f50f0a86497f98f228c50c607bb2", + "sha256:8c66d6fec467e8c0f975818c1796d25c53521124b7cfb760114be0abad53a0a2", + "sha256:8ed07a90f5450d99dad60d3799f9c03c6566709bd53b497eb9ccad9a55867f36", + "sha256:9bc6d1a7f8cedd519c4b7b1156d98e051b726bf160715b769106661d567b3f03", + "sha256:9e1591f6ae98bcfac2a4bbf9221c0b92ab49762228f38287f6eeb5f3f55905ce", + "sha256:9e87562b91f68dd8b1c39149d0323b42e0082db7ddb8e934ab4c292094d575d6", + "sha256:a7081fd19a6d573e1a05e600c82a1c421011db7935ed0d5c483e9dd96b99cf13", + "sha256:a8474703bffc65ca15853d5fd4d06b18138ae90c17c8d12169968e998e448bb5", + "sha256:af36e0aa45e25c9f57bf684b1175e59ea05d9a7d3e8e87b7ae1a1da246f2767e", + "sha256:b1240f767f69d7c4c8a29adde2310b871153df9b26b5cb2b54a561ac85146485", + "sha256:b4d362e17bcb0011738c2d83e0a65ea8ce627057b2fdda37678f4374a382a137", + "sha256:b831295e5472954104ecb46cd98c08b98b49c69fdb7040483aff799a755a7374", + "sha256:b8c275f0ae90069496068c714387b4a0eba5d531aace269559ff2b43655edd58", + "sha256:bdd2b45bf079d9ad90377048e2747a0c82351989a2165821f0c96831b4a2a54b", + "sha256:cc0743f0302b94f397a4a65a660d4cd24267439eb16493fb3caad2e4389bccbb", + "sha256:da4b0c6c699a0ad73c810736303f7fbae483bcb012e38d7eb06a5e3b432c981b", + "sha256:f25e2811a9c932e43943a2615e65fc487a0b6b49218899e62e426e7f0a57eeda", + "sha256:f73497e8c38295aaa4741bdfa4fda1a5aedda5473074369eca10626835445511" ], "index": "pypi", - "version": "==1.14.2" + "markers": "python_version >= '3.9'", + "version": "==1.26.3" } }, "develop": { - "nose": { + "iniconfig": { "hashes": [ - "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac", - "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a", - "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98" + "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3", + "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374" + ], + "markers": "python_version >= '3.7'", + "version": "==2.0.0" + }, + "packaging": { + "hashes": [ + "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5", + "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7" + ], + "markers": "python_version >= '3.7'", + "version": "==23.2" + }, + "pluggy": { + "hashes": [ + "sha256:7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981", + "sha256:8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be" + ], + "markers": "python_version >= '3.8'", + "version": "==1.4.0" + }, + "pytest": { + "hashes": [ + "sha256:249b1b0864530ba251b7438274c4d251c58d868edaaec8762893ad4a0d71c36c", + "sha256:50fb9cbe836c3f20f0dfa99c565201fb75dc54c8d76373cd1bde06b06657bdb6" ], "index": "pypi", - "version": "==1.3.7" + "markers": "python_version >= '3.8'", + "version": "==8.0.0" } } } diff --git a/setup.py b/setup.py index 1cbdf6c..855b660 100644 --- a/setup.py +++ b/setup.py @@ -81,6 +81,5 @@ def finalize_options(self): "numpy >= 1.6", "scipy >= 0.9" ], - test_suite='nose.collector', - tests_require=['nose'] + tests_require=['pytest'] ) diff --git a/src/test_interface.py b/src/test_interface.py index aa18622..c20168d 100644 --- a/src/test_interface.py +++ b/src/test_interface.py @@ -1,35 +1,8 @@ -# for python 3 testing compatibility -from __future__ import print_function import platform - -def import_error(msg): - print() - print("## IMPORT ERROR:", msg) - print() - -try: - from nose.tools import assert_raises, assert_almost_equals -except ImportError: - import_error("Please install nose to run tests.") - raise - -try: - import ecos -except ImportError: - import_error("You must install the ecos module before running tests.") - raise - -try: - import numpy as np -except ImportError: - import_error("Please install numpy.") - raise - -try: - import scipy.sparse as sp -except ImportError: - import_error("Please install scipy.") - raise +import pytest +import ecos +import numpy as np +import scipy.sparse as sp # global data structures for problem c = np.array([-1.]) @@ -40,50 +13,39 @@ def import_error(msg): dims = {'q': [], 'l': 2} def check_solution(solution, expected): - assert_almost_equals(solution, expected, places=5) - -def test_problems(): - myopts = {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8, 'verbose':True}; - sol = ecos.solve(c, G, h, dims, **myopts) - yield check_solution, sol['x'][0], 4 - - sol = ecos.solve(c, G, h, dims, A, b, **myopts) - yield check_solution, sol['x'][0], 3 + np.testing.assert_almost_equal(solution, expected, decimal=5) - new_dims = {'q':[2], 'l': 0} - sol = ecos.solve(c, G, h, new_dims, **myopts) - yield check_solution, sol['x'][0], 2 +@pytest.mark.parametrize("inputs,expected", [ + ((c, G, h, dims, {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8, 'verbose': True}), 4), + ((c, G, h, dims, A, b, {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8, 'verbose': True}), 3), + ((c, G, h, {'q': [2], 'l': 0}, {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8, 'verbose': True}), 2) +]) +def test_problems(inputs, expected): + sol = ecos.solve(*inputs[:-1], **inputs[-1]) + check_solution(sol['x'][0], expected) if platform.python_version_tuple() < ('3','0','0'): - def test_problems_with_longs(): - new_dims = {'q': [], 'l': long(2)} - myopts = {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8}; - sol = ecos.solve(c, G, h, new_dims, **myopts) - yield check_solution, sol['x'][0], 4 - - sol = ecos.solve(c, G, h, new_dims, A, b, **myopts) - yield check_solution, sol['x'][0], 3 - - new_dims = {'q':[long(2)], 'l': 0} - sol = ecos.solve(c, G, h, new_dims, **myopts) - yield check_solution, sol['x'][0], 2 - -def check_keyword(error_type, keyword, value): - assert_raises(error_type, ecos.solve, c,G,h,dims, **{keyword: value}) - -def test_failures(): - yield assert_raises, TypeError, ecos.solve - yield assert_raises, TypeError, ecos.solve, c, G, h, dims, A - - yield assert_raises, ValueError, ecos.solve, c, G, h, {'q':[], 'l':0} - yield assert_raises, TypeError, ecos.solve, c, G, h, {'q':[4], 'l':-2} - - yield check_keyword, TypeError, 'verbose', 0 - yield check_keyword, ValueError, 'feastol', 0 - yield check_keyword, ValueError, 'abstol', 0 - yield check_keyword, ValueError, 'reltol', 0 - yield check_keyword, ValueError, 'feastol_inacc', 0 - yield check_keyword, ValueError, 'abstol_inacc', 0 - yield check_keyword, ValueError, 'reltol_inacc', 0 - yield check_keyword, ValueError, 'max_iters', -1 - yield check_keyword, TypeError, 'max_iters', 1.1 + @pytest.mark.parametrize("new_dims,expected", [ + ({'q': [], 'l': 2}, 4), + ({'q': [], 'l': 2}, 3), + ({'q': [2], 'l': 0}, 2) + ]) + def test_problems_with_longs(new_dims, expected): + myopts = {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8} + sol = ecos.solve(c, G, h, new_dims, **myopts) + check_solution(sol['x'][0], expected) + +@pytest.mark.parametrize("error_type,keyword,value", [ + (TypeError, 'verbose', 0), + (ValueError, 'feastol', 0), + (ValueError, 'abstol', 0), + (ValueError, 'reltol', 0), + (ValueError, 'feastol_inacc', 0), + (ValueError, 'abstol_inacc', 0), + (ValueError, 'reltol_inacc', 0), + (ValueError, 'max_iters', -1), + (TypeError, 'max_iters', 1.1), +]) +def test_failures(error_type, keyword, value): + with pytest.raises(error_type): + ecos.solve(c, G, h, dims, **{keyword: value}) diff --git a/src/test_interface_bb.py b/src/test_interface_bb.py index a4aba46..48a5c0f 100644 --- a/src/test_interface_bb.py +++ b/src/test_interface_bb.py @@ -1,4 +1,3 @@ -from __future__ import print_function import ecos import numpy as np import scipy.sparse as sp @@ -17,8 +16,6 @@ sol = ecos.solve(c, G, h, dims, verbose=False, mi_verbose=False, int_vars_idx=bool_idx) -print(sol['x']) - c = np.array([-1., -1.]) h = np.array([ 4., 12., 0., 0.]) bool_idx = [] @@ -33,8 +30,6 @@ sol = ecos.solve(c, G, h, dims, verbose=False, mi_verbose=False, int_vars_idx=bool_idx) -print(sol['x']) - c = np.array([-1., -1.1]) h = np.array([ 4., 12., 0., 0.]) bool_idx = [1,0] @@ -49,8 +44,6 @@ sol = ecos.solve(c, G, h, dims, verbose=False, mi_verbose=False, int_vars_idx=bool_idx) -print(sol['x']) - c = np.array([-1., -1.5]) h = np.array([ 4., 12., 0. , 0.]) @@ -64,6 +57,4 @@ dims = dict() dims['l'] = 4 -sol = ecos.solve(c, G, h, dims, verbose=False, mi_verbose=True, bool_vars_idx=bool_idx) -print(sol) -print(sol['x']) +sol = ecos.solve(c, G, h, dims, verbose=False, mi_verbose=True, bool_vars_idx=bool_idx) \ No newline at end of file From ee18b2404eddef42f6d6147741ac29864e252731 Mon Sep 17 00:00:00 2001 From: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Date: Tue, 6 Feb 2024 23:29:43 +0000 Subject: [PATCH 73/79] Update tests --- src/test_interface.py | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/test_interface.py b/src/test_interface.py index c20168d..3f4a138 100644 --- a/src/test_interface.py +++ b/src/test_interface.py @@ -12,28 +12,33 @@ b = np.array([3.]) dims = {'q': [], 'l': 2} + def check_solution(solution, expected): np.testing.assert_almost_equal(solution, expected, decimal=5) @pytest.mark.parametrize("inputs,expected", [ - ((c, G, h, dims, {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8, 'verbose': True}), 4), - ((c, G, h, dims, A, b, {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8, 'verbose': True}), 3), - ((c, G, h, {'q': [2], 'l': 0}, {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8, 'verbose': True}), 2) + ((c, G, h, dims, {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8, 'verbose': False}), 4), + ((c, G, h, dims, A, b, {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8, 'verbose': False}), 3), + ((c, G, h, {'q': [2], 'l': 0}, {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8, 'verbose': False}), 2) ]) def test_problems(inputs, expected): sol = ecos.solve(*inputs[:-1], **inputs[-1]) check_solution(sol['x'][0], expected) -if platform.python_version_tuple() < ('3','0','0'): - @pytest.mark.parametrize("new_dims,expected", [ - ({'q': [], 'l': 2}, 4), - ({'q': [], 'l': 2}, 3), - ({'q': [2], 'l': 0}, 2) - ]) - def test_problems_with_longs(new_dims, expected): - myopts = {'feastol': 2e-8, 'reltol': 2e-8, 'abstol': 2e-8} - sol = ecos.solve(c, G, h, new_dims, **myopts) - check_solution(sol['x'][0], expected) + +def test_call_failures(): + with pytest.raises(TypeError): + ecos.solve() + + with pytest.raises(TypeError): + ecos.solve(c, G, h, dims, A) + + with pytest.raises(ValueError): + ecos.solve(c, G, h, {'q':[], 'l':0}) + + with pytest.raises(TypeError): + ecos.solve(c, G, h, {'q':[4], 'l':-2}) + @pytest.mark.parametrize("error_type,keyword,value", [ (TypeError, 'verbose', 0), @@ -46,6 +51,6 @@ def test_problems_with_longs(new_dims, expected): (ValueError, 'max_iters', -1), (TypeError, 'max_iters', 1.1), ]) -def test_failures(error_type, keyword, value): +def test_keyword_errors(error_type, keyword, value): with pytest.raises(error_type): ecos.solve(c, G, h, dims, **{keyword: value}) From 0e09150bb86f666d4f0f5b6ce41c4e54b746681f Mon Sep 17 00:00:00 2001 From: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Date: Tue, 6 Feb 2024 23:44:09 +0000 Subject: [PATCH 74/79] =?UTF-8?q?Bump=20version:=202.0.12=20=E2=86=92=202.?= =?UTF-8?q?0.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- setup.py | 2 +- src/ecos/version.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e8b6be4..c652b38 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.0.12 +current_version = 2.0.13 files = setup.py src/ecos/version.py commit = True tag = True diff --git a/setup.py b/setup.py index 855b660..8031cba 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ def finalize_options(self): setup( name = 'ecos', - version = '2.0.12', + version = '2.0.13', author = 'Alexander Domahidi, Eric Chu, Han Wang, Santiago Akle', author_email = 'domahidi@embotech.com, echu@cs.stanford.edu, hanwang2@stanford.edu, tiagoakle@gmail.com', url = 'http://github.com/embotech/ecos', diff --git a/src/ecos/version.py b/src/ecos/version.py index 9195a40..ffcf622 100644 --- a/src/ecos/version.py +++ b/src/ecos/version.py @@ -1 +1 @@ -__version__="2.0.12" \ No newline at end of file +__version__="2.0.13" \ No newline at end of file From a0cb1d02902b2981fcac3fd7a83237c19f76c690 Mon Sep 17 00:00:00 2001 From: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Date: Mon, 17 Jun 2024 15:13:05 -0700 Subject: [PATCH 75/79] Updates build-requires --- pyproject.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index bbf49ad..e7b20a1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,2 +1,7 @@ [build-system] -requires = ["wheel", "setuptools", "oldest-supported-numpy"] +requires = [ + "numpy >= 2.0.0; python_version > '3.8'", + "oldest-supported-numpy; python_version <= '3.8'", + "wheel", + "setuptools" +] From eaa2ee6c83983ddf99421d5428695837464b565f Mon Sep 17 00:00:00 2001 From: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Date: Mon, 17 Jun 2024 19:59:25 -0700 Subject: [PATCH 76/79] updates macos --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5ad05e..ff2d337 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-20.04, macos-11, windows-2019 ] + os: [ ubuntu-20.04, macos-12, windows-2019 ] python-version: [ 3.7, 3.9, 3.8, "3.10", "3.11", "3.12" ] env: @@ -70,13 +70,13 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-20.04, macos-11, windows-2019 ] + os: [ ubuntu-20.04, macos-12, windows-2019 ] python-version: [ 3.7, 3.9, "3.10", "3.11", "3.12" ] include: - os: ubuntu-20.04 python-version: 3.8 single_action_config: "True" - - os: macos-11 + - os: macos-12 python-version: 3.8 - os: windows-2019 python-version: 3.8 From 669f0249a320398b109e82454adc44d5715740e7 Mon Sep 17 00:00:00 2001 From: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Date: Mon, 17 Jun 2024 20:03:19 -0700 Subject: [PATCH 77/79] Updates CI --- .github/workflows/build.yml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff2d337..5329d20 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,15 +8,13 @@ on: tags: - '*' -jobs: - cleanup-runs: - runs-on: ubuntu-latest - steps: - - uses: rokroskar/workflow-run-cleanup-action@master - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'" +# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value +# Only cancels-in-progress on PRs (head_ref only defined in PR, fallback run_id always unique) +concurrency: + group: ${{ github.head_ref || github.run_id }} + cancel-in-progress: true +jobs: build: runs-on: ${{ matrix.os }} defaults: @@ -26,16 +24,16 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, macos-12, windows-2019 ] - python-version: [ 3.7, 3.9, 3.8, "3.10", "3.11", "3.12" ] + python-version: [ 3.9, 3.8, "3.10", "3.11", "3.12" ] env: PYTHON_VERSION: ${{ matrix.python-version }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: recursive - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true python-version: ${{ matrix.python-version }} @@ -91,10 +89,10 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: recursive - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Set Additional Envs @@ -109,7 +107,7 @@ jobs: env: CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*" CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*" - uses: joerick/cibuildwheel@v2.16.5 + uses: pypa/cibuildwheel@v2.19.1 - name: Build source if: ${{env.DEPLOY == 'True' && env.SINGLE_ACTION_CONFIG == 'True'}} @@ -126,7 +124,7 @@ jobs: - name: Upload artifacts to github if: ${{env.DEPLOY == 'True'}} - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: - name: wheels - path: ./wheelhouse + name: wheels-${{ matrix.os }}-${{ matrix.python-version }} + path: ./wheelhouse \ No newline at end of file From 81965ec03ec752e5f7ad22dd3afa023ab851db3a Mon Sep 17 00:00:00 2001 From: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Date: Tue, 18 Jun 2024 03:41:08 +0000 Subject: [PATCH 78/79] =?UTF-8?q?Bump=20version:=202.0.13=20=E2=86=92=202.?= =?UTF-8?q?0.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- setup.py | 2 +- src/ecos/version.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index c652b38..c50a39f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.0.13 +current_version = 2.0.14 files = setup.py src/ecos/version.py commit = True tag = True diff --git a/setup.py b/setup.py index 8031cba..3abb805 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ def finalize_options(self): setup( name = 'ecos', - version = '2.0.13', + version = '2.0.14', author = 'Alexander Domahidi, Eric Chu, Han Wang, Santiago Akle', author_email = 'domahidi@embotech.com, echu@cs.stanford.edu, hanwang2@stanford.edu, tiagoakle@gmail.com', url = 'http://github.com/embotech/ecos', diff --git a/src/ecos/version.py b/src/ecos/version.py index ffcf622..ebd5663 100644 --- a/src/ecos/version.py +++ b/src/ecos/version.py @@ -1 +1 @@ -__version__="2.0.13" \ No newline at end of file +__version__="2.0.14" \ No newline at end of file From fdbab664248e88e88e6b22c9777dbde23ceff4ae Mon Sep 17 00:00:00 2001 From: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Date: Mon, 17 Jun 2024 20:50:39 -0700 Subject: [PATCH 79/79] removes 3.7 support --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5329d20..225bff3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, macos-12, windows-2019 ] - python-version: [ 3.9, 3.8, "3.10", "3.11", "3.12" ] + python-version: [ 3.8, 3.9, "3.10", "3.11", "3.12" ] env: PYTHON_VERSION: ${{ matrix.python-version }} @@ -69,7 +69,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, macos-12, windows-2019 ] - python-version: [ 3.7, 3.9, "3.10", "3.11", "3.12" ] + python-version: [ 3.9, "3.10", "3.11", "3.12" ] include: - os: ubuntu-20.04 python-version: 3.8