Skip to content

Commit

Permalink
Prep for CVXPY 1.1.19 release (#1673)
Browse files Browse the repository at this point in the history
* all semantic versioning infrastructure accumulated on master (PRs #1598, #1617, #1624). Bugfixes for kron with parameters (issue #1656), M1 build failures (issue #1604), Anderson Acceleration docs and warning for SCS 2.X (follow-up from PR #1670).

* Propagate bugfix in PR #1607

* Propagate bugfixes from PR #1660

* Propagate bugfix in PR #1628

* Propagate bugfixes from PR #1621

* Propogate commit to fix #1581

* Propagate regression fix from PR #1677

* update test for cumsum, new test for cummax, fix cummax

* Propagate NumPy error handling from PR #1648

* Propagate bugfix from PR #1648 (but move location of tests)

* propagate bugfix from PR #1687

* Propagate bugfixes in PR #1688
  • Loading branch information
rileyjmurray committed Mar 8, 2022
1 parent a43aed7 commit 5c7ee64
Show file tree
Hide file tree
Showing 45 changed files with 1,164 additions and 658 deletions.
5 changes: 0 additions & 5 deletions .bumpversion.cfg

This file was deleted.

53 changes: 53 additions & 0 deletions .github/workflows/docs.yml
@@ -0,0 +1,53 @@
name: doc_deploy

on:
workflow_dispatch:

jobs:
doc_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v2
with:
python-version: 3.8
- uses: actions/checkout@v2
with:
ref: gh-pages
- name: Set already deployed versions
run: |
python -m pip install packaging
echo LATEST_DEPLOYED_VERSION=$(python -c "import os;from packaging import version;print(sorted([version.parse(i) for i in os.listdir('version')])[-1])") >> $GITHUB_ENV
echo ALL_DEPLOYED_VERSIONS=$(python -c "import os;from packaging import version;print(os.listdir('version'))") >> $GITHUB_ENV
# Checkout master
- uses: actions/checkout@v2
- name: Install
run: |
python -m pip install -e .
python -m pip install sphinx
cd doc
make html
- name: Set current version
run: |
export CURRENT_VERSION=$(python -c "import cvxpy;__version__ = cvxpy.__version__;print('.'.join(__version__.split('.')[:2]))")
echo CURRENT_VERSION=$CURRENT_VERSION >> $GITHUB_ENV
echo VERSION_PATH=/version/$CURRENT_VERSION >> $GITHUB_ENV
echo DEPLOY_LATEST=$(python continuous_integration/doc_is_latest.py --c "$CURRENT_VERSION" --l "$LATEST_DEPLOYED_VERSION") >> $GITHUB_ENV
- name: Deploy this version
uses: JamesIves/github-pages-deploy-action@v4.2.2
with:
branch: gh-pages # The branch the action should deploy to.
folder: doc/build/html # The folder the action should deploy.
target-folder: ${{ env.VERSION_PATH }}

- name: Create version json
run: |
python continuous_integration/doc_write_versions.py
mv versions.json doc/build/html
- name: Deploy to root if latest version
if: ${{env.DEPLOY_LATEST == 'True'}}
uses: JamesIves/github-pages-deploy-action@v4.2.2
with:
branch: gh-pages # The branch the action should deploy to.
folder: doc/build/html # The folder the action should deploy.
clean-exclude: |
version/
4 changes: 4 additions & 0 deletions .gitignore
Expand Up @@ -56,3 +56,7 @@ env_*
venv/
pip-wheel-metadata/
tags

# Things specific to this project
cvxpy/version.py

2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Expand Up @@ -11,4 +11,4 @@ repos:
hooks:
- id: flake8
args: ['--config=setup.cfg']
files: cvxpy/
files: ^(cvxpy|continuous_integration)/
274 changes: 0 additions & 274 deletions CHANGELOG.md

This file was deleted.

0 comments on commit 5c7ee64

Please sign in to comment.