Skip to content

Fixed version check to encompass Python 3.10 #174

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

Merged
merged 3 commits into from
Oct 12, 2021
Merged

Fixed version check to encompass Python 3.10 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
426eeae
Fixed version check to encompass Python 3.10
Axe319 Oct 8, 2021
405062d
Added username to contributors.md
Axe319 Oct 11, 2021
cd4cac0
Merge branch 'version_check' of https://github.com/Axe319/vpython-jup…
Axe319 Oct 11, 2021
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
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ We are certain the list is incomplete; please let one of us know by opening an [
+ Kyle Dunn ([@kdunn926](https://github.com/kdunn926))
+ Brian Su ([@brianbbsu](https://github.com/brianbbsu))
+ [@0dminnimda](https://github.com/0dminnimda)
+ Mike Miller ([@Axe319](https://github.com/axe319))

## Full timeline of vpython development

Expand Down
12 changes: 6 additions & 6 deletions vpython/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
# both of those.

from ._notebook_helpers import _isnotebook, __is_spyder
import platform
__p = platform.python_version()
import sys
__v = sys.version_info

# Delete platform now that we are done with it
del platform
# Delete sys now that we are done with it
del sys

__ispython3 = (__p[0] == '3')
__require_notebook = (not __ispython3) or (__p[2] < '5') # Python 2.7 or 3.4 require Jupyter notebook
__ispython3 = (__v.major == 3)
__require_notebook = (not __ispython3) or (__v.minor < 5) # Python 2.7 or 3.4 require Jupyter notebook

if __require_notebook and (not _isnotebook):
s = "The non-notebook version of vpython requires Python 3.5 or later."
Expand Down