Unpin setuptools #2022

SteveDiamond · 2023-01-24T17:19:08Z

Description

Unpins setuptools so the latest version can be installed.
Issue link (if applicable): #2021

Type of change

New feature (backwards compatible)
New feature (breaking API changes)
Bug fix
Other (Documentation, CI, ...)

Contribution checklist

Add our license to new files.
Check that your code adheres to our coding style.
Write unittests.
Run the unittests and check that they’re passing.
Run the benchmarks to make sure your change doesn’t introduce a regression.

github-actions · 2023-01-24T17:27:59Z

Benchmarks that have stayed the same:

   before           after         ratio
 [8415ccc6]       [eaab0fe1]
      4.37±0s          4.53±0s     1.04  simple_LP_benchmarks.SimpleFullyParametrizedLPBenchmark.time_compile_problem
      38.1±0s          38.5±0s     1.01  cvar_benchmark.CVaRBenchmark.time_compile_problem
      9.67±0s          9.74±0s     1.01  optimal_advertising.OptimalAdvertising.time_compile_problem
      55.9±0s          56.2±0s     1.01  sdp_segfault_1132_benchmark.SDPSegfault1132Benchmark.time_compile_problem
      2.18±0s          2.17±0s     0.99  simple_LP_benchmarks.SimpleScalarParametrizedLPBenchmark.time_compile_problem
      10.6±0s          10.5±0s     0.99  semidefinite_programming.SemidefiniteProgramming.time_compile_problem
      28.4±0s          28.0±0s     0.99  simple_LP_benchmarks.SimpleLPBenchmark.time_compile_problem
      12.6±0s          12.4±0s     0.98  huber_regression.HuberRegression.time_compile_problem
      13.9±0s          13.5±0s     0.97  svm_l1_regularization.SVMWithL1Regularization.time_compile_problem

sonarcloud · 2023-01-24T18:11:23Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

phschiele · 2023-01-24T18:45:37Z

Some context: the pinning was added in #1950.
The root cause seems to be resolved:
pypa/setuptools#3693 (comment)

phschiele

LGTM. Perhaps we could also pin a lower version to make sure it installs on all systems, as anyone requiring more recent versions (e.g. because of vulnerabilities) would not be blocked by having a loose lower bound. I looked at the logs of the Mac/3.7 build but it did not say which version was installed, presumably it used an already installed version.

The pin was backported, so I'm adding a label to backport the unpin as well.

SteveDiamond · 2023-01-24T20:08:57Z

LGTM. Perhaps we could also pin a lower version to make sure it installs on all systems, as anyone requiring more recent versions (e.g. because of vulnerabilities) would not be blocked by having a loose lower bound. I looked at the logs of the Mac/3.7 build but it did not say which version was installed, presumably it used an already installed version.

I removed the upperbound so this shouldn't be an issue right?

phschiele · 2023-01-24T20:22:21Z

LGTM. Perhaps we could also pin a lower version to make sure it installs on all systems, as anyone requiring more recent versions (e.g. because of vulnerabilities) would not be blocked by having a loose lower bound. I looked at the logs of the Mac/3.7 build but it did not say which version was installed, presumably it used an already installed version.

I removed the upperbound so this shouldn't be an issue right?

@SteveDiamond yes, exactly. Just saying we could also put the lower bound that also works with MacOS/3.7 for example. But fine for me as is 👍

* unpin setuptools * all setuptools > 65.5.1 * fix mac python 3.7 build

@aszekMosek

* Cleanup in MOSEK parameters setting (#2029) * Cleanup in MOSEK parameters setting * isort * fix flake8 + isort * added pytest.warns() --------- Co-authored-by: Steven Diamond <diamond@cs.stanford.edu> Co-authored-by: Steven Diamond <steven@gridmatic.com> * Fix Mosek power cone (#2043) * missing reset of local i * add issue as test case * P-norm issue with DGP problems (#2028) * fix dgp canonicalization for pnorms * add pnorm test * flake8 * Add var test for pnorm input * flake8 * flake8 again, newline whitespace * Unpin setuptools (#2022) * unpin setuptools * all setuptools > 65.5.1 * fix mac python 3.7 build * fixing typo in documentation (#2044) Co-authored-by: Transurgeon <peter.zijie@gmail.com> * New deepcopy semantics (#2053) * Draft * Remove redundant asserts * Add docs * use copy.copy --------- Co-authored-by: Steven Diamond <steven@gridmatic.com> * Attach Mosek log handler before inputting data (#2017) * Attach Mosek log handler before inputting data * fixing flake8 Co-authored-by: Steven Diamond <steven@gridmatic.com> * Update index.rst (#2016) change `x` to `X` in second `tv` function definition * [CI] Build wheels on push (#2008) * Build wheels on push * Update .github/workflows/build.yml * Change env variable for cvxpy-base * [CI] aarch64 wheels (#2054) * Add setup for aarch64 wheels * Build wheels in PR * Specify nupmy version * syntax fix * Revert "Build wheels in PR" This reverts commit 77ee7ba. * Mosek Interface: Keep sparsity for PSD constraints (#2063) * Keep sparsity for PSD constraints * Add typing, docstring * Rename coo_array to coo_matrix for backward compatibility * Explicitly handle list and ndarray * Fix issue with matrix multiplication involving quad (#2067) * bugfix * Fix typo --------- Co-authored-by: Philipp Schiele <44360364+phschiele@users.noreply.github.com> * Initial cut at adding error on raw float keys and tuples of floats (#2058) * Adds error on raw float keys and tuples of floats * Adds tests. * Gets tests passing. * Improves tests * Fixes formatting * Fixes tests again * Improved psd check message (#2009) * Fixes for 1.3.0 (#1998) * fix relative import * do not use __builtins__ as dict * fix #2059 (#2060) * remove ill-posed test case for xexp atom (#2001) Remove ill-posed test case for xexp atom Per @aszekMosek's [comment](#1978 (comment)) on the last operator relative entropy PR, our test case for ``xexp`` that fixes the input ``x = 0`` in ``xexp(x)`` results in an ill-posed conic formulation. That is, an arbitrarily small perturbation to the conic formulation can change the problem from feasible to infeasible. This change keeps the spirit of the test while avoiding that particular case. --------- Co-authored-by: aszekMosek <michal.adamaszek@mosek.com> Co-authored-by: Jeffrey Chen <jlchen0@ucla.edu> Co-authored-by: William Zijie Zhang <89562186+Transurgeon@users.noreply.github.com> Co-authored-by: Transurgeon <peter.zijie@gmail.com> Co-authored-by: Philipp Schiele <44360364+phschiele@users.noreply.github.com> Co-authored-by: Samuel Adekunle <me@samuel-adekunle.software> Co-authored-by: Parth Nobel <parthnobel@berkeley.edu> Co-authored-by: h-vetinari <h.vetinari@gmx.com> Co-authored-by: Riley Murray <rileyjmurray@users.noreply.github.com>

* unpin setuptools * all setuptools > 65.5.1 * fix mac python 3.7 build

@aszekMosek

* fixing typo in documentation (#2044) Co-authored-by: Transurgeon <peter.zijie@gmail.com> * Fix Mosek power cone (#2043) * missing reset of local i * add issue as test case * remove ill-posed test case for xexp atom (#2001) Remove ill-posed test case for xexp atom Per @aszekMosek's [comment](#1978 (comment)) on the last operator relative entropy PR, our test case for ``xexp`` that fixes the input ``x = 0`` in ``xexp(x)`` results in an ill-posed conic formulation. That is, an arbitrarily small perturbation to the conic formulation can change the problem from feasible to infeasible. This change keeps the spirit of the test while avoiding that particular case. * Improved psd check message (#2009) * Initial cut at adding error on raw float keys and tuples of floats (#2058) * Adds error on raw float keys and tuples of floats * Adds tests. * Gets tests passing. * Improves tests * Fixes formatting * Fixes tests again * Fix issue with matrix multiplication involving quad (#2067) * bugfix * Fix typo --------- Co-authored-by: Philipp Schiele <44360364+phschiele@users.noreply.github.com> * [CI] Build wheels on push (#2008) * Build wheels on push * Update .github/workflows/build.yml * Change env variable for cvxpy-base * Update index.rst (#2016) change `x` to `X` in second `tv` function definition * Unpin setuptools (#2022) * unpin setuptools * all setuptools > 65.5.1 * fix mac python 3.7 build * P-norm issue with DGP problems (#2028) * fix dgp canonicalization for pnorms * add pnorm test * flake8 * Add var test for pnorm input * flake8 * flake8 again, newline whitespace * Cleanup in MOSEK parameters setting (#2029) * Cleanup in MOSEK parameters setting * isort * fix flake8 + isort * added pytest.warns() --------- Co-authored-by: Steven Diamond <diamond@cs.stanford.edu> Co-authored-by: Steven Diamond <steven@gridmatic.com> * Fix cvxpy base pypi deployment (#2071) * fix cvxpy base env * remove PYPI PASSWORD * Fixes for 1.3.0 (#1998) * fix relative import * do not use __builtins__ as dict * Fix psd_wrap import * Revert "Fix psd_wrap import" This reverts commit fec43d4. * Revert "Improved psd check message (#2009)" This reverts commit b47c9bc. --------- Co-authored-by: William Zijie Zhang <89562186+Transurgeon@users.noreply.github.com> Co-authored-by: Transurgeon <peter.zijie@gmail.com> Co-authored-by: Steven Diamond <diamond@cs.stanford.edu> Co-authored-by: Riley Murray <rileyjmurray@users.noreply.github.com> Co-authored-by: Parth Nobel <parthnobel@berkeley.edu> Co-authored-by: Samuel Adekunle <me@samuel-adekunle.software> Co-authored-by: Jeffrey Chen <jlchen0@ucla.edu> Co-authored-by: aszekMosek <michal.adamaszek@mosek.com> Co-authored-by: Steven Diamond <steven@gridmatic.com> Co-authored-by: h-vetinari <h.vetinari@gmx.com>

* fixing typo in documentation (#2044) Co-authored-by: Transurgeon <peter.zijie@gmail.com> * Fix Mosek power cone (#2043) * missing reset of local i * add issue as test case * Improved psd check message (#2009) * Initial cut at adding error on raw float keys and tuples of floats (#2058) * Adds error on raw float keys and tuples of floats * Adds tests. * Gets tests passing. * Improves tests * Fixes formatting * Fixes tests again * Fix issue with matrix multiplication involving quad (#2067) * bugfix * Fix typo --------- Co-authored-by: Philipp Schiele <44360364+phschiele@users.noreply.github.com> * [CI] Build wheels on push (#2008) * Build wheels on push * Update .github/workflows/build.yml * Change env variable for cvxpy-base * Update index.rst (#2016) change `x` to `X` in second `tv` function definition * Unpin setuptools (#2022) * unpin setuptools * all setuptools > 65.5.1 * fix mac python 3.7 build * P-norm issue with DGP problems (#2028) * fix dgp canonicalization for pnorms * add pnorm test * flake8 * Add var test for pnorm input * flake8 * flake8 again, newline whitespace * Cleanup in MOSEK parameters setting (#2029) * Cleanup in MOSEK parameters setting * isort * fix flake8 + isort * added pytest.warns() --------- Co-authored-by: Steven Diamond <diamond@cs.stanford.edu> Co-authored-by: Steven Diamond <steven@gridmatic.com> * Fix cvxpy base pypi deployment (#2071) * fix cvxpy base env * remove PYPI PASSWORD * Fixes for 1.3.0 (#1998) * fix relative import * do not use __builtins__ as dict * Fix psd_wrap import * Remove proxqp * Install cplex * Do not fix setuptools during dependency install * Revert "Fix psd_wrap import" This reverts commit 3179e8e. * Revert "Improved psd check message (#2009)" This reverts commit ab3171c. * Specify warning type --------- Co-authored-by: William Zijie Zhang <89562186+Transurgeon@users.noreply.github.com> Co-authored-by: Transurgeon <peter.zijie@gmail.com> Co-authored-by: Steven Diamond <diamond@cs.stanford.edu> Co-authored-by: Parth Nobel <parthnobel@berkeley.edu> Co-authored-by: Samuel Adekunle <me@samuel-adekunle.software> Co-authored-by: Jeffrey Chen <jlchen0@ucla.edu> Co-authored-by: aszekMosek <michal.adamaszek@mosek.com> Co-authored-by: Steven Diamond <steven@gridmatic.com> Co-authored-by: h-vetinari <h.vetinari@gmx.com>

unpin setuptools

ff6359a

SteveDiamond added 2 commits January 24, 2023 09:30

all setuptools > 65.5.1

4951edd

fix mac python 3.7 build

7bb7a0d

phschiele approved these changes Jan 24, 2023

View reviewed changes

phschiele added the backport bugfix to 1.1; 1.2; 1.3 label Jan 24, 2023

SteveDiamond merged commit 4a24db3 into master Jan 24, 2023

SteveDiamond deleted the bugfix/unpin-setuptools branch January 27, 2023 19:20

SteveDiamond added a commit that referenced this pull request Mar 16, 2023

Unpin setuptools (#2022)

9c1fe8f

* unpin setuptools * all setuptools > 65.5.1 * fix mac python 3.7 build

SteveDiamond mentioned this pull request Mar 16, 2023

Prep for 1.3.1 #2068

Merged

phschiele pushed a commit that referenced this pull request Mar 22, 2023

Unpin setuptools (#2022)

1208fe7

* unpin setuptools * all setuptools > 65.5.1 * fix mac python 3.7 build

phschiele pushed a commit that referenced this pull request Mar 22, 2023

Unpin setuptools (#2022)

72b65c4

* unpin setuptools * all setuptools > 65.5.1 * fix mac python 3.7 build

phschiele mentioned this pull request Mar 22, 2023

Prep for 1.2.4 #2076

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unpin setuptools #2022

Unpin setuptools #2022

SteveDiamond commented Jan 24, 2023

github-actions bot commented Jan 24, 2023 •

edited

sonarcloud bot commented Jan 24, 2023

phschiele commented Jan 24, 2023

phschiele left a comment

SteveDiamond commented Jan 24, 2023

phschiele commented Jan 24, 2023

Unpin setuptools #2022

Unpin setuptools #2022

Conversation

SteveDiamond commented Jan 24, 2023

Description

Type of change

Contribution checklist

github-actions bot commented Jan 24, 2023 • edited

sonarcloud bot commented Jan 24, 2023

phschiele commented Jan 24, 2023

phschiele left a comment

Choose a reason for hiding this comment

SteveDiamond commented Jan 24, 2023

phschiele commented Jan 24, 2023

github-actions bot commented Jan 24, 2023 •

edited