Skip to content

Commit

Permalink
Merge pull request #661 from scipopt/new-release-4.3
Browse files Browse the repository at this point in the history
New release 4.3
  • Loading branch information
mattmilten authored Mar 17, 2023
2 parents 11ab457 + 1e5454e commit 854eb94
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 24 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -19,15 +19,15 @@ 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: |
wget --quiet --no-check-certificate https://scipopt.org/download/release/SCIPOptSuite-${{ env.version }}-Linux-ubuntu.deb
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 }}

Expand All @@ -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
Expand All @@ -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 }}

Expand All @@ -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
Expand Down Expand Up @@ -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 }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-release.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -13,15 +13,15 @@ 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: |
wget --quiet --no-check-certificate https://scipopt.org/download/release/SCIPOptSuite-${{ env.version }}-Linux-ubuntu.deb
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'

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/update-packages-and-documentation.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -32,17 +32,17 @@ 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
- uses: actions/checkout@v3

- name: Install dependencies (SCIPOptSuite)
run: |
wget --quiet --no-check-certificate https://scipopt.org/download/release/SCIPOptSuite-${{ env.version }}-Linux-ubuntu.deb
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 }}

Expand All @@ -65,9 +65,9 @@ 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
- uses: actions/checkout@v3

- name: Download dependencies (SCIPOptSuite)
shell: powershell
Expand All @@ -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 }}

Expand All @@ -102,15 +102,15 @@ jobs:
needs: Windows-test
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Install dependencies (SCIPOptSuite)
run: |
wget --quiet --no-check-certificate https://scipopt.org/download/release/SCIPOptSuite-${{ env.version }}-Linux-ubuntu.deb
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'

Expand Down
11 changes: 7 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/pyscipopt/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '4.2.0'
__version__ = '4.3.0'

# required for Python 3.8 on Windows
import os
Expand Down

0 comments on commit 854eb94

Please sign in to comment.