Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherrypick/1.1.x #1884

Merged
merged 17 commits into from
Nov 4, 2022
Merged

Cherrypick/1.1.x #1884

merged 17 commits into from
Nov 4, 2022

Conversation

SteveDiamond
Copy link
Collaborator

@SteveDiamond SteveDiamond commented Aug 31, 2022 •
edited
Loading

Description

Cherry picks the following PRs:

#1882

#1880

#1852

#1851

#1844

#1835

#1829

#1855

#1886

#1898

#1922

#1854

#1871

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.

fabinsch and others added 8 commits August 31, 2022 10:05
@fabinsch @SteveDiamond
fix osqp warm start (#1882)
464b326
@SteveDiamond
switch SCS timings to seconds (#1880)
18e9a02 
Co-authored-by: Steven Diamond <steven@gridmatic.com>
@phschiele @SteveDiamond
merge fix
6ba2165
@phschiele @SteveDiamond
merge fix
2d0c1f4
@SteveDiamond @phschiele
Fix SOC residual (#1844)
bf1e094 
* fix SOC residual

* dimension test

* Suggestion for how to compute SOC residual (#1853)

Co-authored-by: phschiele <44360364+phschiele@users.noreply.github.com>
@SteveDiamond
Fix bug with diff (#1835)
ad52347 
* fix #1834

* test error

Co-authored-by: Steven Diamond <steven@gridmatic.com>
@SteveDiamond
fix #1828 (#1829)
e90b7a4
@SteveDiamond
fix mosek
ec1f4bb
@SteveDiamond
Copy link
Collaborator Author

The tests fail for Python 3.6 because they use the old mosek version. I think this is fine and we can still merge. 1.3 is coming out soon and 1.1 will no longer be supported at that point.

@rileyjmurray
Copy link
Collaborator

@SteveDiamond see my comment on your PR that changed the MOSEK test.

@sonarcloud
Copy link

sonarcloud bot commented Sep 1, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

97.4% 97.4% Coverage
0.0% 0.0% Duplication

@rileyjmurray
Copy link
Collaborator

@SteveDiamond please add 3fad774 to this PR when you get a chance.

@phschiele
Copy link
Collaborator

@SteveDiamond I've looked through the PRs since the last release that were classified as bug fixes, but not yet included in the two cherry-pick PRs:
#1854
#1859 (only relevant for cherry pick 1.2.x PR)
#1871

roberthuisman and others added 2 commits November 3, 2022 14:48
@roberthuisman @SteveDiamond
fix gradient for multidimensional quad form (#1854)
ecf00c2 
* fix multidimensional quad form

* autoblack messed up line ordering
@KerimovEmil @phschiele @SteveDiamond
Adding edge case handling for string inputs into norm (#1871)
1899519 
* Adding edge case handling for string inputs into norm

Signed-off-by: KerimovEmil <emilkerimov93@gmail.com>

* Update cvxpy/atoms/norm.py

Co-authored-by: phschiele <44360364+phschiele@users.noreply.github.com>

* Adding norm exception tests to ensure that invalid string inputs are caught

Signed-off-by: KerimovEmil <emilkerimov93@gmail.com>
Co-authored-by: phschiele <44360364+phschiele@users.noreply.github.com>
Co-authored-by: Steven Diamond <steven@gridmatic.com>
@sonarcloud
Copy link

sonarcloud bot commented Nov 3, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

87.6% 87.6% Coverage
0.0% 0.0% Duplication

@SteveDiamond
Copy link
Collaborator Author

@SteveDiamond I've looked through the PRs since the last release that were classified as bug fixes, but not yet included in the two cherry-pick PRs: #1854 #1859 (only relevant for cherry pick 1.2.x PR) #1871

Great! I've cherry picked these PRs.

@phschiele
Copy link
Collaborator

@SteveDiamond I think that all bug-fix PRs are incorporated, and everything is passing. Both PRs LGTM.

@SteveDiamond SteveDiamond merged commit 7a2a4b4 into release/1.1.x Nov 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@SteveDiamond @rileyjmurray @phschiele @fabinsch @roberthuisman @KerimovEmil