Skip to content

Commit 34a9e0b

Browse files
committed
drop manylinux2010, no longer have sufficient dependency wheels to build easily and support was dropped august 1 2022 pypa/manylinux#1281
1 parent 74f209f commit 34a9e0b

File tree

7 files changed

+16
-155
lines changed

7 files changed

+16
-155
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,6 @@ jobs:
723723
- 3.9
724724
container:
725725
- none # Not manylinux, we will use this space to build the WASM assets
726-
- 2010
727726
- 2014
728727
node-version: [16.x]
729728
is-full-run:
@@ -735,18 +734,12 @@ jobs:
735734
# Things to always exclude #
736735
############################
737736
# Exclude manylinux python builds other than linux
738-
- os: macos-11
739-
container: 2010
740737
- os: macos-11
741738
container: 2014
742739

743-
- os: windows-2022
744-
container: 2010
745740
- os: windows-2022
746741
container: 2014
747742

748-
- os: windows-2019
749-
container: 2010
750743
- os: windows-2019
751744
container: 2014
752745

@@ -757,10 +750,6 @@ jobs:
757750
##############################################
758751
# Things to exclude if not a full matrix run #
759752
##############################################
760-
# Exclude manylinux2010 python builds
761-
- is-full-run: false
762-
container: 2010
763-
764753
# Exclude windows builds if set
765754
- include-windows-run: false
766755
os: windows-2022

python/perspective/scripts/test_wheels.sh

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

scripts/build_python.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const {
2222

2323
let PYTHON = python_version();
2424

25-
let IMAGE = "manylinux2010";
25+
let IMAGE = "manylinux2014";
2626
const IS_DOCKER = process.env.PSP_DOCKER;
2727

2828
if (IS_DOCKER) {

scripts/publish_python.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const dist_folders = [
4343
"perspective-python-dist-macos-11-3.8",
4444
"perspective-python-dist-macos-11-3.9",
4545

46-
// Ubuntu (Manylinux 2010 and 2014 docker images)
46+
// Ubuntu (Manylinux 2014 docker images)
4747
"perspective-python-dist-ubuntu-20.04-3.7",
4848
"perspective-python-dist-ubuntu-20.04-3.8",
4949
"perspective-python-dist-ubuntu-20.04-3.9",
@@ -70,12 +70,6 @@ const wheels = [
7070
"cp38-cp38-macosx_11_0_x86_64",
7171
"cp39-cp39-macosx_11_0_x86_64",
7272

73-
// Manylinux 2010
74-
// "cp36-cp36m-manylinux2010_x86_64",
75-
"cp37-cp37m-manylinux2010_x86_64",
76-
"cp38-cp38-manylinux2010_x86_64",
77-
"cp39-cp39-manylinux2010_x86_64",
78-
7973
// Manylinux 2014
8074
// "cp36-cp36m-manylinux2014_x86_64",
8175
"cp37-cp37m-manylinux2014_x86_64",

scripts/repl.js

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,17 @@
77
*
88
*/
99

10-
const {execute, docker, getarg, python_image} = require("./script_utils.js");
11-
12-
let PYTHON = getarg("--python38")
13-
? "python3.8"
14-
: getarg("--python36")
15-
? "python3.6"
16-
: "python3.7";
17-
let IMAGE = "manylinux2010";
18-
19-
let MANYLINUX_VERSION = getarg("--manylinux2010")
20-
? "manylinux2010"
21-
: getarg("--manylinux2014")
22-
? "manylinux2014"
23-
: "manylinux2010";
10+
const {
11+
execute,
12+
docker,
13+
python_image,
14+
python_version,
15+
manylinux_version,
16+
} = require("./script_utils.js");
2417

18+
let PYTHON = python_version();
19+
let IMAGE = "manylinux2014";
20+
let MANYLINUX_VERSION = manylinux_version();
2521
IMAGE = python_image(MANYLINUX_VERSION, PYTHON);
2622

2723
try {

scripts/script_utils.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,11 +378,11 @@ exports.manylinux_version = function manylinux_version() {
378378
if (process.env.MANYLINUX) {
379379
return `manylinux${process.env.MANYLINUX}`;
380380
} else if (getarg("--manylinux2010")) {
381-
return "manylinux2010";
381+
throw new Exception("manylinux2010 no longer supported");
382382
} else if (getarg("--manylinux2014")) {
383383
return "manylinux2014";
384384
} else {
385-
return "manylinux2010";
385+
return "manylinux2014";
386386
}
387387
};
388388
/*******************************************************************************

scripts/test_python.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ const IS_DOCKER = process.env.PSP_DOCKER;
2626
const PYTEST_FLAGS =
2727
"--junitxml=python_junit.xml --cov-report=xml --cov-branch --cov=perspective --disable-pytest-warnings";
2828

29-
let IMAGE = "manylinux2010";
29+
let IMAGE = "manylinux2014";
3030

3131
if (IS_DOCKER) {
32-
// defaults to 2010
32+
// defaults to 2014
3333
let MANYLINUX_VERSION = manylinux_version();
3434
IMAGE = python_image(MANYLINUX_VERSION, PYTHON);
3535
}

0 commit comments

Comments
 (0)