Skip to content

Commit 35c7b81

Browse files
visualpythonvisualpython
committed
deploy visualpython 2.4.6
1 parent 0f232d3 commit 35c7b81

17 files changed

+102
-27
lines changed

‎build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#=============================================================================
1212
# Set version and replace it
1313
#=============================================================================
14-
VP_ORG_VER=2.4.4
15-
VP_NEW_VER=2.4.5
14+
VP_ORG_VER=2.4.5
15+
VP_NEW_VER=2.4.6
1616

1717
# update version info
1818
grep -REil "VP_ORG_VER=.+$" colab/build.colab.sh jupyterlab/build.jupyterlab.sh jupyternotebook/build.jupyternotebook.sh | xargs sed -i "s/VP_ORG_VER=.\+$/VP_ORG_VER=${VP_ORG_VER}/g"

‎colab/build.colab.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#=============================================================================
1212
# Replace Version
1313
#=============================================================================
14-
VP_ORG_VER=2.4.4
15-
VP_NEW_VER=2.4.5
14+
VP_ORG_VER=2.4.5
15+
VP_NEW_VER=2.4.6
1616

1717
# update version info
1818
# update manifest version with new numbering for new version

‎colab/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Visual Python for Colab",
33
"description": "GUI-based Python code generator for Google Colab as an extension",
4-
"version": "2.4.5",
4+
"version": "2.4.6",
55
"manifest_version": 3,
66
"icons": {
77
"48": "icon.png",

‎jupyterlab/README.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
[![License: GPLv3](https://img.shields.io/badge/License-GPLv3-brightgreen)](https://github.com/visualpython/visualpython/blob/main/LICENSE)
66
[![Downloads](https://static.pepy.tech/personalized-badge/visualpython?period=total&units=international_system&left_color=grey&right_color=orange&left_text=Downloads)](https://pepy.tech/project/visualpython)
77
[![Issues: ](https://img.shields.io/github/issues/visualpython/visualpython?color=%23FF6347)](https://github.com/visualpython/visualpython/issues)
8-
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/visualpython/visualpython-binder/HEAD?labpath=index.ipynb)
8+
[![lite-badge]][lite]
9+
10+
[lite-badge]: https://jupyterlite.rtfd.io/en/latest/_static/badge.svg
11+
[lite]: https://visualpython.github.io/visualpython-lite/lab/index.html
912

1013
## Introduction
1114
Visual Python is a GUI-based Python code generator, developed on the **Jupyter Lab**, **Jupyter Notebook** and **Google Colab** as an extension. <br>
@@ -27,7 +30,7 @@ Try Visual Python if you would like to: <br>
2730

2831
Visual Python is an extension to Jupyter Lab, so you must have Jupyter Lab installed already.<br>
2932
- Python version 3.x
30-
- Jupyter lab environment
33+
- Jupyter lab environment(<= 3.6.3)
3134

3235
### 2. How to Install
3336

@@ -92,6 +95,26 @@ Visual Python is an extension to Google Colab, so you must have Google Colab ope
9295

9396
**3) Activate Visual Python on Google Colab**
9497

98+
99+
## Getting Started with Visual Python Desktop
100+
### 1. Introduction
101+
Visual Python Desktop is an installer to create an isolated jupyter environment and enable to use Visual Python easily.
102+
103+
It simplifies the process of configuring an independent Python environment, installing essential packages, and setting up a Jupyter environment, allowing users to focus on data analysis using python.
104+
105+
### 2. Requirements
106+
- Operating System: Windows 10 or later (macOS and Linux support coming soon)
107+
- Minimum 4GB RAM, recommended 8GB RAM or higher
108+
- Minimum 10GB of disk space
109+
110+
### 3. How to Install
111+
1) Download the Visual Python Desktop installer.
112+
- [Link to Visual Python Desktop installer page](https://visualpython.ai/visualpython-desktop)
113+
114+
2) Run the installer and follow the provided instructions for the installation process.
115+
116+
3) Use the shortcut created in Start menu or on Desktop to execute Jupyter Notebook (Visual Python), Jupyter Lab (Visual Python), and Visual Python Prompt according to your needs.
117+
95118
## Contributing
96119
If you are interested in contributing to the Visual Python, please see [`CONTRIBUTING.md`](CONTRIBUTING.md). <br>
97120
All skills from programmers, non-programmers, designers are welcomed.
@@ -113,4 +136,4 @@ To create an environment where everyone can learn and use big data analytical sk
113136
Love Visual Python? <br>
114137
Your support will help us continue to actively develop and improve Visual Python.☕
115138

116-
[![donate_banner](https://user-images.githubusercontent.com/83636412/229679467-4fee93a2-d6d2-4229-a53c-80a5eb2b9240.png)](https://github.com/sponsors/visualpython?frequency=recurring)
139+
[![donate_banner](https://user-images.githubusercontent.com/83636412/229679467-4fee93a2-d6d2-4229-a53c-80a5eb2b9240.png)](https://github.com/sponsors/visualpython?frequency=recurring)

‎jupyterlab/build.jupyterlab.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#=============================================================================
1212
# Replace Version and Basic Files
1313
#=============================================================================
14-
VP_ORG_VER=2.4.4
15-
VP_NEW_VER=2.4.5
14+
VP_ORG_VER=2.4.5
15+
VP_NEW_VER=2.4.6
1616

1717
# update version info
1818
grep -REil "\"version\": \"${VP_ORG_VER}\"" package.json | xargs sed -i "s/\"version\": \"${VP_ORG_VER//\./\\.}\"/\"version\": \"${VP_NEW_VER}\"/g"

‎jupyterlab/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎jupyterlab/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jupyterlab-visualpython",
3-
"version": "2.4.5",
3+
"version": "2.4.6",
44
"description": "GUI-based Python code generator for Jupyter Lab as an extension",
55
"keywords": [
66
"jupyter",

‎jupyterlab/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ classifiers = [
3232
"Programming Language :: Python :: 3.9",
3333
"Programming Language :: Python :: 3.10",
3434
]
35-
version = "2.4.5"
35+
version = "2.4.6"
3636

3737
[project.license]
3838
file = "LICENSE"
@@ -92,7 +92,7 @@ file = [
9292
]
9393

9494
[tool.tbump.version]
95-
current = "2.4.5"
95+
current = "2.4.6"
9696
regex = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)((?P<channel>a|b|rc|.dev)(?P<release>\\d+))?"
9797

9898
[tool.tbump.git]

‎jupyternotebook/README.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
[![License: GPLv3](https://img.shields.io/badge/License-GPLv3-brightgreen)](https://github.com/visualpython/visualpython/blob/main/LICENSE)
66
[![Downloads](https://static.pepy.tech/personalized-badge/visualpython?period=total&units=international_system&left_color=grey&right_color=orange&left_text=Downloads)](https://pepy.tech/project/visualpython)
77
[![Issues: ](https://img.shields.io/github/issues/visualpython/visualpython?color=%23FF6347)](https://github.com/visualpython/visualpython/issues)
8-
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/visualpython/visualpython-binder/HEAD?labpath=index.ipynb)
8+
[![lite-badge]][lite]
9+
10+
[lite-badge]: https://jupyterlite.rtfd.io/en/latest/_static/badge.svg
11+
[lite]: https://visualpython.github.io/visualpython-lite/lab/index.html
912

1013
## Introduction
1114
Visual Python is a GUI-based Python code generator, developed on the **Jupyter Lab**, **Jupyter Notebook** and **Google Colab** as an extension. <br>
@@ -27,7 +30,7 @@ Try Visual Python if you would like to: <br>
2730

2831
Visual Python is an extension to Jupyter Lab, so you must have Jupyter Lab installed already.<br>
2932
- Python version 3.x
30-
- Jupyter lab environment
33+
- Jupyter lab environment(<= 3.6.3)
3134

3235
### 2. How to Install
3336

@@ -92,6 +95,26 @@ Visual Python is an extension to Google Colab, so you must have Google Colab ope
9295

9396
**3) Activate Visual Python on Google Colab**
9497

98+
99+
## Getting Started with Visual Python Desktop
100+
### 1. Introduction
101+
Visual Python Desktop is an installer to create an isolated jupyter environment and enable to use Visual Python easily.
102+
103+
It simplifies the process of configuring an independent Python environment, installing essential packages, and setting up a Jupyter environment, allowing users to focus on data analysis using python.
104+
105+
### 2. Requirements
106+
- Operating System: Windows 10 or later (macOS and Linux support coming soon)
107+
- Minimum 4GB RAM, recommended 8GB RAM or higher
108+
- Minimum 10GB of disk space
109+
110+
### 3. How to Install
111+
1) Download the Visual Python Desktop installer.
112+
- [Link to Visual Python Desktop installer page](https://visualpython.ai/visualpython-desktop)
113+
114+
2) Run the installer and follow the provided instructions for the installation process.
115+
116+
3) Use the shortcut created in Start menu or on Desktop to execute Jupyter Notebook (Visual Python), Jupyter Lab (Visual Python), and Visual Python Prompt according to your needs.
117+
95118
## Contributing
96119
If you are interested in contributing to the Visual Python, please see [`CONTRIBUTING.md`](CONTRIBUTING.md). <br>
97120
All skills from programmers, non-programmers, designers are welcomed.
@@ -113,4 +136,4 @@ To create an environment where everyone can learn and use big data analytical sk
113136
Love Visual Python? <br>
114137
Your support will help us continue to actively develop and improve Visual Python.☕
115138

116-
[![donate_banner](https://user-images.githubusercontent.com/83636412/229679467-4fee93a2-d6d2-4229-a53c-80a5eb2b9240.png)](https://github.com/sponsors/visualpython?frequency=recurring)
139+
[![donate_banner](https://user-images.githubusercontent.com/83636412/229679467-4fee93a2-d6d2-4229-a53c-80a5eb2b9240.png)](https://github.com/sponsors/visualpython?frequency=recurring)

‎jupyternotebook/build.jupyternotebook.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#=============================================================================
1212
# Replace Version and Basic Files
1313
#=============================================================================
14-
VP_ORG_VER=2.4.4
15-
VP_NEW_VER=2.4.5
14+
VP_ORG_VER=2.4.5
15+
VP_NEW_VER=2.4.6
1616

1717
# update version info
1818
grep -REil ${VP_ORG_VER//\./\\.} setup.py visualpython/js/com/com_Config.js visualpython/js/com/com_Const.js | xargs sed -i --follow-symlinks "s/${VP_ORG_VER//\./\\.}/${VP_NEW_VER}/g"

‎jupyternotebook/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
setup(
1212
name = name,
13-
version = '2.4.5',
13+
version = '2.4.6',
1414
packages = find_packages(),
1515
package_data = {"": ["*"], 'visualpython' : ['visualpython.yaml', 'README.md']},
1616
scripts = ['visualpython/bin/visualpy', 'visualpython/bin/visualpy.bat'],

‎visualpython/js/com/com_Config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ define([
10521052
/**
10531053
* Version
10541054
*/
1055-
Config.version = "2.4.5";
1055+
Config.version = "2.4.6";
10561056

10571057
/**
10581058
* Type of mode

‎visualpython/js/com/com_Const.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ define ([
1919
class Constants { }
2020

2121
Constants.TOOLBAR_BTN_INFO = {
22-
HELP: "Visual Python 2.4.5"
22+
HELP: "Visual Python 2.4.6"
2323
, ICON: "vp-main-icon"
2424
, ID: "vpBtnToggle"
2525
, NAME: "toggle-vp"

‎visualpython/js/com/com_generatorV2.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,11 @@ define([
764764
}
765765
// code completion 2
766766
if (v.usePair == true) {
767-
val = ', ' + v.name + '=' + val;
767+
if (v.pairKey) {
768+
val = ', ' + v.pairKey + '=' + val;
769+
} else {
770+
val = ', ' + v.name + '=' + val;
771+
}
768772
}
769773
// code completion 3
770774
if (v.component != undefined && v.componentCode != undefined) {

‎visualpython/js/com/component/PopupComponent.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -900,9 +900,23 @@ define([
900900
}
901901
}
902902

903+
if (requiredFilled) {
904+
requiredFilled = this.checkBeforeRun();
905+
}
906+
903907
return requiredFilled;
904908
}
905909

910+
/**
911+
* Check options and do some operation before run
912+
* @returns {boolean} check options and returns true or false (false will stop code running)
913+
*/
914+
checkBeforeRun() {
915+
/** Implementation needed */
916+
917+
return true;
918+
}
919+
906920
checkAndRunModules(execute=true, background=false) {
907921
let sigText = this.getSigText();
908922

‎visualpython/js/m_ml/FitPredict.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -691,10 +691,11 @@ define([
691691
'fit': {
692692
name: 'fit',
693693
label: 'Fit',
694-
code: '${model}.fit(${fit_featureData})',
694+
code: '${model}.fit(${fit_featureData}${fit_targetData})',
695695
description: 'Run fit with all sets of parameters.',
696696
options: [
697-
{ name: 'fit_featureData', label: 'Feature Data', component: ['data_select'], var_type: ['DataFrame', 'Series', 'ndarray', 'list', 'dict'], value: 'X' }
697+
{ name: 'fit_featureData', label: 'Feature Data', component: ['data_select'], var_type: ['DataFrame', 'Series', 'ndarray', 'list', 'dict'], value: 'X_train' },
698+
{ name: 'fit_targetData', label: 'Target Data', component: ['data_select'], var_type: ['DataFrame', 'Series', 'ndarray', 'list', 'dict'], value: 'y_train', usePair: true, pairKey: 'y' }
698699
]
699700
},
700701
'predict': {
@@ -703,7 +704,7 @@ define([
703704
code: '${pred_allocate} = ${model}.predict(${pred_featureData})',
704705
description: 'Call predict on the estimator with the best found parameters.',
705706
options: [
706-
{ name: 'pred_featureData', label: 'Feature Data', component: ['data_select'], var_type: ['DataFrame', 'Series', 'ndarray', 'list', 'dict'], value: 'X' },
707+
{ name: 'pred_featureData', label: 'Feature Data', component: ['data_select'], var_type: ['DataFrame', 'Series', 'ndarray', 'list', 'dict'], value: 'X_test' },
707708
{ name: 'pred_allocate', label: 'Allocate to', component: ['input'], placeholder: 'New variable', value: 'pred' }
708709
]
709710
},

‎visualpython/js/m_ml/GridSearch.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,16 @@ define([
404404
return [ installCode ];
405405
}
406406

407+
checkBeforeRun() {
408+
// if no param is registered, stop and show alert
409+
if ($(this.wrapSelector('.vp-param-result-item')).length <= 0) {
410+
com_util.renderAlertModal('No params added. Please add params.');
411+
return false;
412+
}
413+
414+
return true;
415+
}
416+
407417
generateCode() {
408418
let { modelType, userOption, allocateToCreation, model } = this.state;
409419
let code = new com_String();

0 commit comments

Comments
 (0)