Skip to content

Commit 3a3b29d

Browse files
minjk-blminjk-bl
authored
Merge pull request #240 from visualpython/release
Release v2.4.8
2 parents 6147cc0 + 39a0a01 commit 3a3b29d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+940
-249
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.6
15-
VP_NEW_VER=2.4.7
14+
VP_ORG_VER=2.4.7
15+
VP_NEW_VER=2.4.8
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.6
15-
VP_NEW_VER=2.4.7
14+
VP_ORG_VER=2.4.7
15+
VP_NEW_VER=2.4.8
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.7",
4+
"version": "2.4.8",
55
"manifest_version": 3,
66
"icons": {
77
"48": "icon.png",

‎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.6
15-
VP_NEW_VER=2.4.7
14+
VP_ORG_VER=2.4.7
15+
VP_NEW_VER=2.4.8
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.7",
3+
"version": "2.4.8",
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.7"
35+
version = "2.4.8"
3636

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

9494
[tool.tbump.version]
95-
current = "2.4.7"
95+
current = "2.4.8"
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/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.6
15-
VP_NEW_VER=2.4.7
14+
VP_ORG_VER=2.4.7
15+
VP_NEW_VER=2.4.8
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.7',
13+
version = '2.4.8',
1414
packages = find_packages(),
1515
package_data = {"": ["*"], 'visualpython' : ['visualpython.yaml', 'README.md']},
1616
scripts = ['visualpython/bin/visualpy', 'visualpython/bin/visualpy.bat'],

‎visualpython/css/m_ml/gridSearch.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
}
4141
.vp-param-set-add {
4242
cursor: pointer;
43+
margin-bottom: 5px;
4344
}
4445
.vp-param-item > label {
4546
align-self: center;

‎visualpython/css/m_ml/pipeline.css

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
.vp-pp-right-box {
1717
display: grid;
18-
grid-template-rows: 35px 10px calc(100% - 45px);
18+
grid-template-rows: 35px 10px calc(100% - 80px) 35px;
1919
padding-left: 5px;
2020
overflow: auto;
2121
}
@@ -45,7 +45,13 @@
4545
position: absolute;
4646
transition: all 0.5s ease-in-out;
4747
}
48-
.vp-pp-item:not(:last-child):before {
48+
.vp-pp-item:last-child:before,
49+
.vp-pp-item:last-child:after,
50+
.vp-pp-item.vp-last-visible:before,
51+
.vp-pp-item.vp-last-visible:after {
52+
display: none;
53+
}
54+
.vp-pp-item:before {
4955
border: 0.25px solid var(--vp-gray-color);
5056
border-width: 0 4px 4px 0;
5157
display: inline-block;
@@ -55,7 +61,7 @@
5561
top: 47px;
5662
left: 100px;
5763
}
58-
.vp-pp-item:not(:last-child):after {
64+
.vp-pp-item:after {
5965
border: 0.25px solid var(--vp-gray-color);
6066
border-width: 0 4px 0 0;
6167
height: 15px;
@@ -129,4 +135,48 @@
129135
}
130136
.vp-pp-step-content:empty::after {
131137
content: 'Select the template and Follow the pipeline to generate simple ML code.'
138+
}
139+
.vp-pp-step-footer {
140+
border-top: 0.25px solid var(--vp-border-gray-color);
141+
width: 100%;
142+
height: 35px;
143+
}
144+
.vp-pp-step-move-btn {
145+
width: 70px;
146+
height: 30px;
147+
background-color: var(--vp-background-color);
148+
border: 0.25px solid var(--vp-border-gray-color);
149+
box-sizing: border-box;
150+
box-shadow: 0.5px 0.5px 0.5px rgb(0 0 0 / 10%);
151+
border-radius: 3px;
152+
line-height: 30px;
153+
vertical-align: middle;
154+
font-family: 'AppleSDGothicNeo';
155+
font-size: 13px;
156+
text-align: center;
157+
color: var(--vp-font-primary);
158+
cursor: pointer;
159+
-webkit-touch-callout: none;
160+
-webkit-user-select: none;
161+
-khtml-user-select: none;
162+
-moz-user-select: none;
163+
-ms-user-select: none;
164+
user-select: none;
165+
166+
display: inline-block;
167+
position: absolute;
168+
bottom: 10px;
169+
}
170+
.vp-pp-step-move-btn:hover {
171+
background-color: var(--vp-light-gray-color);
172+
}
173+
.vp-pp-step-move-btn.disabled {
174+
background-color: var(--vp-gray-color);
175+
cursor: not-allowed;
176+
}
177+
.vp-pp-step-prev {
178+
left: 270px;
179+
}
180+
.vp-pp-step-next{
181+
right: 15px;
132182
}

‎visualpython/data/m_library/pandasLibrary.js

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1916,7 +1916,10 @@ define([
19161916
{
19171917
"name": "by",
19181918
"label": "Sort By",
1919-
"usePair": true
1919+
"usePair": true,
1920+
"component": [
1921+
"col_multi"
1922+
]
19201923
},
19211924
{
19221925
"name": "axis",
@@ -2437,7 +2440,7 @@ define([
24372440
"name": "get data counts",
24382441
"library": "pandas",
24392442
"description": "get data value counts",
2440-
"code": "${o0} = ${i0}.value_counts()",
2443+
"code": "${o0} = ${i0}.value_counts(${bins}${sort}${ascending}${dropna}${etc})",
24412444
"options": [
24422445
{
24432446
"name": "i0",
@@ -2454,7 +2457,39 @@ define([
24542457
"component": [
24552458
"input"
24562459
]
2457-
}
2460+
},
2461+
{
2462+
"name": "bins",
2463+
"component": [
2464+
"input_number"
2465+
],
2466+
"help": "Only for Series object",
2467+
"usePair": true,
2468+
},
2469+
{
2470+
"name": "sort",
2471+
"component": [
2472+
"bool_select"
2473+
],
2474+
"default": "True",
2475+
"usePair": true,
2476+
},
2477+
{
2478+
"name": "ascending",
2479+
"component": [
2480+
"bool_select"
2481+
],
2482+
"default": "False",
2483+
"usePair": true,
2484+
},
2485+
{
2486+
"name": "dropna",
2487+
"component": [
2488+
"bool_select"
2489+
],
2490+
"default": "True",
2491+
"usePair": true,
2492+
},
24582493
]
24592494
},
24602495
"pdIdt_info": {

0 commit comments

Comments
 (0)