From 91b42c29595b0730429046974f23b3f30bf3f10b Mon Sep 17 00:00:00 2001 From: Matthias Miltenberger Date: Fri, 17 Mar 2023 19:28:27 +0100 Subject: [PATCH 1/4] update CHANGELOG --- CHANGELOG.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 617116e00..1a0eff5c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,16 @@ ## Unreleased ### Added +### Fixed +### Changed +### Removed + +## 4.3.0 - 2023-03-17 +### Added - Add SCIP function SCIprowGetOriginCons - Add getConsOriginConshdlrtype to Row - Add possibility to use sine and cosing -- Add ability to set priced variable score - -### Fixed -### Changed +- Add ability to set priced variable score ### Removed - Removed function rowGetNNonz From 3bb9db32773f1508601c116a3900cbc0b8504b1d Mon Sep 17 00:00:00 2001 From: Matthias Miltenberger Date: Fri, 17 Mar 2023 19:28:50 +0100 Subject: [PATCH 2/4] update Python and SCIP versions in actions --- .github/workflows/update-packages-and-documentation.yml | 6 +++--- src/pyscipopt/__init__.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-packages-and-documentation.yml b/.github/workflows/update-packages-and-documentation.yml index ffccf1312..5b2f9f818 100644 --- a/.github/workflows/update-packages-and-documentation.yml +++ b/.github/workflows/update-packages-and-documentation.yml @@ -1,7 +1,7 @@ name: Test and Release PyPI Package env: - version: 8.0.0 + version: 8.0.3 # runs only when a release is published, not on drafts @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: true matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9, 3.10, 3.11] steps: - uses: actions/checkout@v2 @@ -65,7 +65,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: [3.8, 3.9] + python-version: [3.8, 3.9, 3.10, 3.11] steps: - uses: actions/checkout@v2 diff --git a/src/pyscipopt/__init__.py b/src/pyscipopt/__init__.py index 6e9f4ec1e..e3e760dc7 100644 --- a/src/pyscipopt/__init__.py +++ b/src/pyscipopt/__init__.py @@ -1,4 +1,4 @@ -__version__ = '4.2.0' +__version__ = '4.3.0' # required for Python 3.8 on Windows import os From f62ab94eff6ef7c6df8816aa52f4290154922c7b Mon Sep 17 00:00:00 2001 From: Matthias Miltenberger Date: Fri, 17 Mar 2023 19:38:28 +0100 Subject: [PATCH 3/4] increase SCIP version in other GH actions --- .github/workflows/integration-test.yml | 2 +- .github/workflows/test-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index e8d716bbe..c7f281d6e 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -1,7 +1,7 @@ name: Integration test env: - version: 8.0.0 + version: 8.0.3 # runs on branches and pull requests; doesn't run on tags. on: diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml index 69ee29490..cb9fdf44a 100644 --- a/.github/workflows/test-release.yml +++ b/.github/workflows/test-release.yml @@ -1,7 +1,7 @@ name: TestPyPI release env: - version: 8.0.0 + version: 8.0.3 # runs only when a release is published, not on drafts From 1e5454e560922fc1d99dfead0af13400420a3e68 Mon Sep 17 00:00:00 2001 From: Matthias Miltenberger Date: Fri, 17 Mar 2023 20:17:30 +0100 Subject: [PATCH 4/4] update GH actions to latest versions --- .github/workflows/integration-test.yml | 12 ++++++------ .github/workflows/test-release.yml | 4 ++-- .../workflows/update-packages-and-documentation.yml | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index c7f281d6e..d020f5ef6 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -19,7 +19,7 @@ jobs: matrix: python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install dependencies (SCIPOptSuite) run: | @@ -27,7 +27,7 @@ jobs: sudo apt-get update && sudo apt install -y ./SCIPOptSuite-${{ env.version }}-Linux-ubuntu.deb - name: Setup python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -51,7 +51,7 @@ jobs: matrix: python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Download dependencies (SCIPOptSuite) shell: powershell @@ -62,7 +62,7 @@ jobs: run: scipopt-installer.exe /S /D=${{ env.SCIPOPTDIR }} - name: Setup python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -89,7 +89,7 @@ jobs: matrix: python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache dependencies (SCIPOptSuite) id: cache-scip @@ -120,7 +120,7 @@ jobs: make install -j - name: Setup python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml index cb9fdf44a..35f0a34a5 100644 --- a/.github/workflows/test-release.yml +++ b/.github/workflows/test-release.yml @@ -13,7 +13,7 @@ jobs: deploy-packges-and-generate-documentation: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install dependencies (SCIPOptSuite) run: | @@ -21,7 +21,7 @@ jobs: sudo apt-get update && sudo apt install -y ./SCIPOptSuite-${{ env.version }}-Linux-ubuntu.deb - name: Setup python 3 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.x' diff --git a/.github/workflows/update-packages-and-documentation.yml b/.github/workflows/update-packages-and-documentation.yml index 5b2f9f818..7012ed2f7 100644 --- a/.github/workflows/update-packages-and-documentation.yml +++ b/.github/workflows/update-packages-and-documentation.yml @@ -34,7 +34,7 @@ jobs: matrix: python-version: [3.7, 3.8, 3.9, 3.10, 3.11] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install dependencies (SCIPOptSuite) run: | @@ -42,7 +42,7 @@ jobs: sudo apt-get update && sudo apt install -y ./SCIPOptSuite-${{ env.version }}-Linux-ubuntu.deb - name: Setup python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -67,7 +67,7 @@ jobs: matrix: python-version: [3.8, 3.9, 3.10, 3.11] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Download dependencies (SCIPOptSuite) shell: powershell @@ -78,7 +78,7 @@ jobs: run: scipopt-installer.exe /S /D=${{ env.SCIPOPTDIR }} - name: Setup python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -102,7 +102,7 @@ jobs: needs: Windows-test runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install dependencies (SCIPOptSuite) run: | @@ -110,7 +110,7 @@ jobs: sudo apt-get update && sudo apt install -y ./SCIPOptSuite-${{ env.version }}-Linux-ubuntu.deb - name: Setup python 3 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.x'