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

Jump to bottom

Re-drop python3.7 to enable jupyterlab 4 upgrade #2416

Closed
wants to merge 1 commit into from
Closed

Re-drop python3.7 to enable jupyterlab 4 upgrade #2416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 2 additions & 27 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,6 @@ jobs:
- macos-11 # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
- windows-2022 # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md
python-version:
- 3.7
- 3.8
- 3.9
- "3.10"
Expand Down Expand Up @@ -881,10 +880,7 @@ jobs:
- is-full-run: false
os: macos-11

# Exclude Python 3.7, 3.8, 3.10, 3.11 builds
- is-full-run: false
python-version: 3.7

# Exclude Python 3.8, 3.10, 3.11 builds
- is-full-run: false
python-version: 3.8

Expand Down Expand Up @@ -1372,7 +1368,6 @@ jobs:
- macos-11 # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
- windows-2022 # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md
python-version:
- 3.7
- 3.8
- 3.9
- "3.10"
Expand All @@ -1394,15 +1389,7 @@ jobs:
- is-full-run: false
os: macos-11

# GitHub Actions are broken on OSX, don't test 3.7 wheels
# https://github.com/actions/setup-python/issues/682
- python-version: 3.7
os: macos-11

# Exclude Python 3.7, 3.8, 3.10, 3.11 builds
- is-full-run: false
python-version: 3.7

# Exclude Python 3.8, 3.10, 3.11 builds
- is-full-run: false
python-version: 3.8

Expand Down Expand Up @@ -1878,10 +1865,6 @@ jobs:
name: labextension-dist
path: python/perspective/perspective/labextension

- uses: actions/download-artifact@v3
with:
name: perspective-python-dist-ubuntu-20.04-3.7

- uses: actions/download-artifact@v3
with:
name: perspective-python-dist-ubuntu-20.04-3.8
Expand All @@ -1898,10 +1881,6 @@ jobs:
with:
name: perspective-python-dist-ubuntu-20.04-3.11

- uses: actions/download-artifact@v3
with:
name: perspective-python-dist-macos-11-3.7

- uses: actions/download-artifact@v3
with:
name: perspective-python-dist-macos-11-3.8
Expand All @@ -1918,10 +1897,6 @@ jobs:
with:
name: perspective-python-dist-macos-11-3.11

- uses: actions/download-artifact@v3
with:
name: perspective-python-dist-windows-2022-3.7

- uses: actions/download-artifact@v3
with:
name: perspective-python-dist-windows-2022-3.8
Expand Down
134 changes: 0 additions & 134 deletions python/perspective/requirements-37.txt
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions python/perspective/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

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


here = os.path.abspath(os.path.dirname(__file__))
Expand All @@ -43,7 +43,7 @@
long_description = f.read().replace("\r\n", "\n")

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

# Check for `cmake`
if which("cmake") is None and which("cmake.exe") is None:
Expand Down Expand Up @@ -306,11 +306,11 @@ def run_check(self):
classifiers=[
"Development Status :: 5 - Production/Stable",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Framework :: Jupyter :: JupyterLab",
"Framework :: Jupyter :: JupyterLab :: 3",
"Framework :: Jupyter :: JupyterLab :: Extensions",
Expand All @@ -322,7 +322,7 @@ def run_check(self):
data_files=get_data_files(data_files_spec),
include_package_data=True,
zip_safe=False,
python_requires=">=3.7",
python_requires=">=3.8",
install_requires=requires,
extras_require={
"aiohttp": requires_aiohttp,
Expand Down
10 changes: 3 additions & 7 deletions tools/perspective-scripts/sh_perspective.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,8 @@ export function python_version(manylinux) {
return `/opt/python/cp39-cp39/bin/python`;
} else if (getarg("--python38")) {
return `/opt/python/cp38-cp38/bin/python`;
} else if (getarg("--python37")) {
return `/opt/python/cp37-cp37m/bin/python`;
} else {
return `/opt/python/cp37-cp37m/bin/python`;
return `/opt/python/cp39-cp39/bin/python`;
}
} else {
if (process.env.PYTHON_VERSION) {
Expand All @@ -298,8 +296,6 @@ export function python_version(manylinux) {
return "python3.9";
} else if (getarg("--python38")) {
return "python3.8";
} else if (getarg("--python37")) {
return "python3.7";
} else {
return "python3";
}
Expand Down Expand Up @@ -342,8 +338,8 @@ sh.docker = function docker(...args) {
${env_vars} \
-v${CWD}:/usr/src/app/perspective \
-w /usr/src/app/perspective --shm-size=2g -u root \
--cpus="${CPUS}.0"
${IMAGE}
--cpus="${CPUS}.0"
${IMAGE}
bash -c ${sh(...args).toString()}`;
};

Expand Down
Loading