Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Python 3.6 support #1867

Merged
merged 2 commits into from
Jun 27, 2022
Merged

Remove Python 3.6 support #1867

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b9181a
fix github build initialization to properly flag full builds in respo…
timkpaine Jun 23, 2022
9255341
Fully prune python 3.6 from build pipelines, helper scripts, and dock…
timkpaine Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fully prune python 3.6 from build pipelines, helper scripts, and dock… 
…er images (don't need to redeploy docker images for this)
  • Loading branch information
@timkpaine @texodus
timkpaine authored and texodus committed Jun 27, 2022
commit 9255341bf0971335688084762666c4fed23aa5b9
27 changes: 2 additions & 25 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,6 @@ jobs:
- windows-2022 # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md
- windows-2019 # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md
python-version:
- 3.6
- 3.7
- 3.8
- 3.9
Expand Down Expand Up @@ -748,12 +747,6 @@ jobs:
- os: ubuntu-20.04
container: none

# Exclude windows Python 3.6
- os: windows-2022
python-version: 3.6
- os: windows-2019
python-version: 3.6

##############################################
# Things to exclude if not a full matrix run #
##############################################
Expand All @@ -779,10 +772,7 @@ jobs:
- is-full-run: false
os: macos-10.11

# Exclude Python 3.6, 3.7, and 3.8 builds
- is-full-run: false
python-version: 3.6

# Exclude Python 3.7 and 3.8 builds
- is-full-run: false
python-version: 3.7

Expand Down Expand Up @@ -1229,7 +1219,6 @@ jobs:
- windows-2022 # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md
- windows-2019 # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md
python-version:
- 3.6
- 3.7
- 3.8
- 3.9
Expand All @@ -1239,15 +1228,6 @@ jobs:
include-windows-run:
- ${{ needs.initialize.outputs.INCLUDE_WINDOWS == 'true' || needs.initialize.outputs.FULL_RUN == 'true' }}
exclude:
############################
# Things to always exclude #
############################
# Exclude windows Python 3.6
- os: windows-2022
python-version: 3.6
- os: windows-2019
python-version: 3.6

##############################################
# Things to exclude if not a full matrix run #
##############################################
Expand All @@ -1266,10 +1246,7 @@ jobs:
- is-full-run: false
os: macos-10.15

# Exclude Python 3.6, 3.7, and 3.8 builds
- is-full-run: false
python-version: 3.6

# Exclude Python 3.7 and 3.8 builds
- is-full-run: false
python-version: 3.7

Expand Down
18 changes: 1 addition & 17 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,18 +351,7 @@ jobs:
artifact_name: "cp37-cp37m-manylinux2010_x86_64"

? ${{ if or(startsWith(variables['build.sourceBranch'], 'refs/tags/v'), eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.Reason'], 'Manual')) }}
: Python36ManyLinux2010:
python.version: "3.6"
python_flag: "--python36"
manylinux_flag: "--manylinux2010"
artifact_name: "cp36-cp36m-manylinux2010_x86_64"
Python36ManyLinux2014:
python.version: "3.6"
python_flag: "--python36"
manylinux_flag: "--manylinux2014"
artifact_name: "cp36-cp36m-manylinux2014_x86_64"
# Python37ManyLinux2010 is always built
Python37ManyLinux2014:
: Python37ManyLinux2014:
python.version: "3.7"
python_flag: ""
manylinux_flag: "--manylinux2014"
Expand Down Expand Up @@ -472,11 +461,6 @@ jobs:

strategy:
matrix:
Python36:
python.version: "3.6"
python_flag: "--python36"
artifact_name: "cp36-cp36m-macosx_10_15_x86_64"

Python37:
python.version: "3.7"
python_flag: ""
Expand Down
6 changes: 3 additions & 3 deletions python/perspective/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@

CPU_COUNT = os.cpu_count()
except ImportError:
raise Exception("Requires Python 3.6 or later")
raise Exception("Requires Python 3.7 or later")

here = os.path.abspath(os.path.dirname(__file__))

with open(os.path.join(here, "README.md"), encoding="utf-8") as f:
long_description = f.read().replace("\r\n", "\n")

if sys.version_info.major < 3:
raise Exception("Requires Python 3.6 or later")
raise Exception("Requires Python 3.7 or later")


def get_version(file, name="__version__"):
Expand Down Expand Up @@ -283,7 +283,7 @@ def run_check(self):
packages=find_packages(exclude=["bench", "bench.*"]),
include_package_data=True,
zip_safe=False,
python_requires=">=3.6",
python_requires=">=3.7",
install_requires=requires,
extras_require={
"aiohttp": requires_aiohttp,
Expand Down
2 changes: 0 additions & 2 deletions scripts/build_python_azure.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ const fs = require("fs-extra");

let PYTHON = getarg("--python38")
? "python3.8"
: getarg("--python36")
? "python3.6"
: getarg("--python37")
? "python3.7"
: "python3";
Expand Down
3 changes: 0 additions & 3 deletions scripts/publish_python.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,17 @@ if (!process.env.COMMIT) {
const dist_folders = [
// https://github.com/actions/virtual-environments
// Mac 10.15
"perspective-python-dist-macos-10.15-3.6",
"perspective-python-dist-macos-10.15-3.7",
"perspective-python-dist-macos-10.15-3.8",
"perspective-python-dist-macos-10.15-3.9",

// Mac 11
// NOTE: use 10.15
// "perspective-python-dist-macos-11-3.6",
// "perspective-python-dist-macos-11-3.7",
// "perspective-python-dist-macos-11-3.8",
// "perspective-python-dist-macos-11-3.9",

// Ubuntu (Manylinux 2010 and 2014 docker images)
"perspective-python-dist-ubuntu-20.04-3.6",
"perspective-python-dist-ubuntu-20.04-3.7",
"perspective-python-dist-ubuntu-20.04-3.8",
"perspective-python-dist-ubuntu-20.04-3.9",
Expand Down
3 changes: 0 additions & 3 deletions scripts/publish_python_azure.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ async function get(host, path, binary = false) {
try {
const build = process.env.AZURE_BUILD_ID;
const artifacts = [
"cp36-cp36m-macosx_10_15_x86_64",
"cp36-cp36m-manylinux2010_x86_64",
"cp36-cp36m-manylinux2014_x86_64",
"cp37-cp37m-macosx_10_15_x86_64",
"cp37-cp37m-manylinux2010_x86_64",
"cp37-cp37m-manylinux2014_x86_64",
Expand Down
2 changes: 0 additions & 2 deletions scripts/script_utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,6 @@ exports.python_version = function python_version() {
return "python3.8";
} else if (getarg("--python37")) {
return "python3.7";
} else if (getarg("--python36")) {
return "python3.6";
} else {
return "python3";
}
Expand Down