Skip to content

Commit 8cb0f1c

Browse files
Merge branch 'master' into add-printOrigProblem
2 parents ef2f7f8 + 6876af9 commit 8cb0f1c

File tree

140 files changed

+12923
-7343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+12923
-7343
lines changed

.github/workflows/build_wheels.yml

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
1-
name: Build
1+
name: Build wheels
22

33
on:
4-
push:
5-
tags:
6-
- 'v[0-9]+.[0-9]+.[0-9]+'
4+
workflow_dispatch:
5+
inputs:
6+
# scip_version:
7+
# type: string
8+
# description: SCIPOptSuite deployment version
9+
# required: true
10+
# default: "v0.4.0"
11+
upload_to_pypi:
12+
type: boolean
13+
description: Should upload
14+
required: false
15+
default: true
16+
test_pypi:
17+
type: boolean
18+
description: Use Test PyPI
19+
required: false
20+
default: true
721

822
jobs:
923
build_wheels:
@@ -16,7 +30,7 @@ jobs:
1630
arch: x86_64
1731
- os: macos-14
1832
arch: arm64
19-
- os: macos-latest
33+
- os: macos-13
2034
arch: x86_64
2135
- os: windows-latest
2236
arch: AMD64
@@ -27,41 +41,63 @@ jobs:
2741
- uses: actions/checkout@v4
2842

2943
- name: Build wheels
30-
uses: pypa/cibuildwheel@v2.16.5
44+
uses: pypa/cibuildwheel@v2.21.1
3145
env:
3246
CIBW_ARCHS: ${{ matrix.arch }}
3347
CIBW_TEST_REQUIRES: pytest
3448
CIBW_TEST_COMMAND: "pytest {project}/tests"
49+
CIBW_MANYLINUX_*_IMAGE: manylinux_2_28
3550

36-
- uses: actions/upload-artifact@v3
51+
- uses: actions/upload-artifact@v4
3752
with:
53+
name: wheels-${{ matrix.os}}-${{ matrix.arch }}
3854
path: ./wheelhouse/*.whl
3955

4056
build_sdist:
4157
name: Build source distribution
4258
runs-on: ubuntu-latest
4359
steps:
44-
- uses: actions/checkout@v3
60+
- uses: actions/checkout@v4
4561

4662
- name: Build sdist
4763
shell: bash -l {0}
4864
run: pipx run build --sdist
4965

50-
- uses: actions/upload-artifact@v3
66+
- uses: actions/upload-artifact@v4
5167
with:
68+
name: source-distribution
5269
path: dist/*.tar.gz
5370

54-
upload_pypi:
71+
merge_artifacts:
72+
name: Merge Artifacts
5573
needs: [build_wheels, build_sdist]
5674
runs-on: ubuntu-latest
5775
steps:
58-
- uses: actions/download-artifact@v3
76+
- name: Merge Artifacts
77+
uses: actions/upload-artifact/merge@v4
78+
79+
upload_pypi:
80+
needs: [build_wheels, build_sdist, merge_artifacts]
81+
runs-on: ubuntu-latest
82+
if: github.event.inputs.upload_to_pypi == 'true'
83+
steps:
84+
- uses: actions/download-artifact@v4
5985
with:
60-
name: artifact
86+
name: merged-artifacts
6187
path: dist
6288

6389
- uses: pypa/gh-action-pypi-publish@release/v1
90+
if: github.event.inputs.test_pypi == 'false'
6491
with:
6592
user: __token__
6693
password: ${{ secrets.PYPI_API_TOKEN }}
6794
verbose: true
95+
96+
- uses: pypa/gh-action-pypi-publish@release/v1
97+
if: github.event.inputs.test_pypi == 'true'
98+
with:
99+
repository-url: https://test.pypi.org/legacy/
100+
user: __token__
101+
password: ${{ secrets.TESTPYPI_API_TOKEN }}
102+
verbose: true
103+

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Run tests with coverage
22
env:
3-
version: 9.0.0
3+
version: 9.1.0
44

55
on:
66
push:
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Generate documentation
2+
3+
on:
4+
workflow_dispatch:
5+
inputs: {}
6+
7+
jobs:
8+
generate-documentation:
9+
runs-on: ubuntu-20.04
10+
steps:
11+
- uses: actions/checkout@v3
12+
13+
- name: Generate documentation
14+
run: |
15+
sudo apt-get install doxygen graphviz
16+
bash -ex generate-docs.sh "${{ secrets.GITHUB_TOKEN }}" "gh-pages"

.github/workflows/integration-test.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
name: Integration test
22

33
env:
4-
version: 9.0.0
4+
version: 9.1.0
55

66
# runs on branches and pull requests; doesn't run on tags.
77
on:
88
push:
99
branches:
1010
- 'master'
11+
pull_request:
12+
branches:
13+
- 'master'
1114

1215
jobs:
1316

@@ -109,7 +112,7 @@ jobs:
109112
- name: Install dependencies (SCIPOptSuite)
110113
if: steps.cache-scip.outputs.cache-hit != 'true'
111114
run: |
112-
brew install tbb boost
115+
brew install tbb boost bison
113116
wget --quiet --no-check-certificate https://github.com/scipopt/scip/releases/download/$(echo "v${{env.version}}" | tr -d '.')/scipoptsuite-${{ env.version }}.tgz
114117
tar xfz scipoptsuite-${{ env.version }}.tgz
115118
cd scipoptsuite-${{ env.version }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ instance/
8181

8282
# Sphinx documentation
8383
docs/_build/
84+
docs/_autosummary/
8485

8586
# PyBuilder
8687
target/

.readthedocs.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
version: 2
2+
3+
sphinx:
4+
builder: html
5+
configuration: docs/conf.py
6+
7+
build:
8+
os: "ubuntu-22.04"
9+
tools:
10+
python: "3.11"
11+
12+
formats: all
13+
14+
python:
15+
install:
16+
- requirements: docs/requirements.txt

CONTRIBUTING.md

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)