From f7b3abdc89d579214d1201f7b16262ff21ce2117 Mon Sep 17 00:00:00 2001 From: Nico Zanferrari Date: Tue, 22 Oct 2019 21:54:01 +0200 Subject: [PATCH 1/3] Fix broken inframe Vimeo video It fixes Issue #2068 --- applications/examples/views/default/documentation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/examples/views/default/documentation.html b/applications/examples/views/default/documentation.html index d29ab1a9..d94ddc34 100644 --- a/applications/examples/views/default/documentation.html +++ b/applications/examples/views/default/documentation.html @@ -3,7 +3,7 @@
{{=get_content('main')}}
- +
{{=get_content('official')}} {{=get_content('community')}} From 92bb2c22418168a8077c785459946e58c262538c Mon Sep 17 00:00:00 2001 From: Nico Zanferrari Date: Wed, 23 Oct 2019 22:05:12 +0200 Subject: [PATCH 2/3] Added Python 3 binaries to the download page --- .../examples/views/default/download.html | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/applications/examples/views/default/download.html b/applications/examples/views/default/download.html index d8df3871..9abe6856 100644 --- a/applications/examples/views/default/download.html +++ b/applications/examples/views/default/download.html @@ -9,7 +9,8 @@ - + + @@ -17,10 +18,13 @@ + + + - + @@ -48,7 +60,8 @@ +
For Normal UsersFor Normal Users (Py3)For Legacy Users (Py2) For Testers For Developers
- For Windows + Windows binaries - For Windows + Windows binaries + + Windows binaries Git Repository @@ -28,17 +32,25 @@
- For Mac + Mac binaries - For Mac + Mac binaries + + Mac binaries + + Manual
Source Code + Source Code + Source Code
- Manual + Change Log @@ -62,13 +75,19 @@

- The source code version works on Windows and most Unix systems, including Linux, BSD and Mac . It requires Python 2.6 (no more supported), Python 2.7 (stable) or Python 3.5+ (recommended for new projects) already installed on your system. - There are also binary packages for Windows and Mac OS X. They include the Python 2.7 interpreter so you do not need to have it pre-installed. + The source code version works on Windows and most Unix systems, including Linux, BSD and Mac . It requires Python 3.5+ (recommended for new projects) + or Python 2.7+ (stable, for use with legacy apps) already installed on your system. +

+

+ There are also binary packages for Windows and MacOs. They include the Python interpreter version 3.7.4 or 2.7.16, so you do not need to have it pre-installed.

Instructions

-

With the binary packages, after download, just unzip it and then click on web2py.exe (windows) or web2py.app (osx). - If you prefer to run it from source with your own Python interpreter alreay installed, type:

+

With the binary packages, after download, just unzip it and then click on web2py.exe (Windows) or web2py (MacOs).

+

Note that on recent MacOs versions (10.12+) you could face problems in running the binary App program, due to the last changes to the security settings. +In this case, press the 'control' key + click on downloaded file and then 'open' it (confirm the warnings). Finally move the program in Applications and run it from there. +

+

If you prefer to run it from source with your own Python interpreter alreay installed, type:

{{=CODE("python web2py.py", language=None, counter='>', _class='boxCode')}}

or for more info type:

{{=CODE("python web2py.py -h", language=None, counter='>', _class='boxCode')}} From 77bcda3f3ed35b1944cf6bdaa054081fa99f7edc Mon Sep 17 00:00:00 2001 From: Nico Zanferrari Date: Wed, 23 Oct 2019 22:41:19 +0200 Subject: [PATCH 3/3] Added Python 3 binaries to the download page +typo It fixes issue #2027. ** IMPORTANT ** - before approving, you need to copy from https://github.com/nicozanf/web2py-pyinstaller to https://mdipierro.pythonanywhere.com/examples/static the files: - web2py_win.zip - web2py_win_py2.zip - web2py_osx.zip - web2py_osx_py2.zip And also modify the procedures for the "For Testers" versions on https://mdipierro.pythonanywhere.com/examples/static, that should use the previous ones as binaries. --- applications/examples/views/default/download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/examples/views/default/download.html b/applications/examples/views/default/download.html index 9abe6856..dbed6375 100644 --- a/applications/examples/views/default/download.html +++ b/applications/examples/views/default/download.html @@ -87,7 +87,7 @@

Note that on recent MacOs versions (10.12+) you could face problems in running the binary App program, due to the last changes to the security settings. In this case, press the 'control' key + click on downloaded file and then 'open' it (confirm the warnings). Finally move the program in Applications and run it from there.

-

If you prefer to run it from source with your own Python interpreter alreay installed, type:

+

If you prefer to run it from source with your own Python interpreter already installed, type:

{{=CODE("python web2py.py", language=None, counter='>', _class='boxCode')}}

or for more info type:

{{=CODE("python web2py.py -h", language=None, counter='>', _class='boxCode')}}