Skip to content

Commit d923ef8

Browse files
committed
removed abi3 stuff that did not seem to work. Added builds for specific python3.x versions instead - different wheel for individual python versions
1 parent 45f37bb commit d923ef8

File tree

4 files changed

+30
-15
lines changed

4 files changed

+30
-15
lines changed

.github/workflows/CI-macos.yaml

+7-3
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,25 @@ on:
1111
jobs:
1212
build:
1313
runs-on: macos-10.15
14+
strategy:
15+
matrix:
16+
python-version: [3.6, 3.7, 3.8, 3.9, 3.10]
1417

1518
steps:
1619
- uses: actions/checkout@v1
17-
- name: Set up Python 3.6
20+
- name: Set up Python ${{ matrix.python-version }}
1821
uses: actions/setup-python@v2
1922
with:
20-
python-version: 3.6
23+
python-version: ${{ matrix.python-version }}
2124

2225
- name: Install dependencies
2326
run: |
2427
pip install wheel setuptools
2528
pip install -r requirements.txt
2629
2730
- name: Build wheel
28-
run: python setup.py bdist_wheel --py-limited-api=cp36
31+
run: python setup.py bdist_wheel
32+
#--py-limited-api=cp36
2933

3034
- name: Install software
3135
run: pip install --find-links=${{github.workspace}}/dist/ SimpleCRF

.github/workflows/CI-ubuntu.yaml

+7-3
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,25 @@ on:
1111
jobs:
1212
build:
1313
runs-on: ubuntu-18.04
14+
strategy:
15+
matrix:
16+
python-version: [3.6, 3.7, 3.8, 3.9, 3.10]
1417

1518
steps:
1619
- uses: actions/checkout@v1
17-
- name: Set up Python 3.6
20+
- name: Set up Python ${{ matrix.python-version }}
1821
uses: actions/setup-python@v2
1922
with:
20-
python-version: 3.6
23+
python-version: ${{ matrix.python-version }}
2124

2225
- name: Install dependencies
2326
run: |
2427
pip install wheel setuptools
2528
pip install -r requirements.txt
2629
2730
- name: Build wheel
28-
run: python setup.py bdist_wheel --py-limited-api=cp36
31+
run: python setup.py bdist_wheel
32+
#--py-limited-api=cp36
2933

3034
- name: Install software
3135
run: pip install --find-links=${{github.workspace}}/dist/ SimpleCRF

.github/workflows/CI-windows.yaml

+8-6
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,28 @@ on:
1111
jobs:
1212
build:
1313
runs-on: windows-2019
14+
strategy:
15+
matrix:
16+
python-version: [3.6, 3.7, 3.8, 3.9, 3.10]
1417

1518
steps:
1619
- uses: actions/checkout@v1
17-
- name: Set up Python 3.6
20+
- name: Set up Python ${{ matrix.python-version }}
1821
uses: actions/setup-python@v2
1922
with:
20-
python-version: 3.6
23+
python-version: ${{ matrix.python-version }}
2124

2225
- name: Install dependencies
2326
run: |
2427
pip install wheel setuptools
2528
pip install -r requirements.txt
2629
2730
- name: Build wheel
28-
run: python setup.py bdist_wheel --py-limited-api=cp36
31+
run: python setup.py bdist_wheel
32+
#--py-limited-api=cp36
2933

3034
- name: Install software
31-
run: |
32-
pip uninstall SimpleCRF
33-
pip install --find-links=${{github.workspace}}/dist/ SimpleCRF
35+
run: pip install --find-links=${{github.workspace}}/dist/ SimpleCRF
3436

3537
- name: Test import
3638
run: python -c "import denseCRF, maxflow"

setup.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def finalize_options(self):
2626
'dependency/maxflow-v3.0/graph.cpp',
2727
'dependency/maxflow-v3.0/maxflow.cpp',
2828
maxflow_source],
29-
py_limited_api=True)
29+
py_limited_api=False)
3030

3131
module_name2 = 'denseCRF'
3232
densecrf_source = "densecrf_python/wrap2D_py{0:}.cpp".format(py_version)
@@ -47,7 +47,7 @@ def finalize_options(self):
4747
'./dependency/densecrf/external/liblbfgs/lib/lbfgs.c',
4848
densecrf_source,
4949
],
50-
py_limited_api=True)
50+
py_limited_api=False)
5151

5252
module_name3 = 'denseCRF3D'
5353
densecrf_source = "densecrf_python/wrap3D_py{0:}.cpp".format(py_version)
@@ -68,7 +68,7 @@ def finalize_options(self):
6868
'./dependency/densecrf/external/liblbfgs/lib/lbfgs.c',
6969
densecrf_source,
7070
],
71-
py_limited_api=True)
71+
py_limited_api=False)
7272

7373
# Get the summary
7474
description = 'An open-source toolkit for conditional random field (CRF) and dense CRF'
@@ -96,6 +96,11 @@ def finalize_options(self):
9696
classifiers=[
9797
'License :: OSI Approved :: BSD License',
9898
'Programming Language :: Python :: 3 :: Only',
99+
'Programming Language :: Python :: 3.6',
100+
'Programming Language :: Python :: 3.7',
101+
'Programming Language :: Python :: 3.8',
102+
'Programming Language :: Python :: 3.9',
103+
'Programming Language :: Python :: 3.10',
99104
],
100105
python_requires = '>=3.6',
101106
cmdclass={'build_ext': build_ext},)

0 commit comments

Comments
 (0)