Skip to content

Commit 18a6945

Browse files
gaborbernatmartinRenou
authored andcommitted
Release 1.2.0
Signed-off-by: Bernát Gábor <[email protected]>
1 parent db74b36 commit 18a6945

File tree

7 files changed

+90
-101
lines changed

7 files changed

+90
-101
lines changed

.github/workflows/check.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,22 @@ concurrency:
1515

1616
jobs:
1717
lint:
18-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v4
2121
- uses: actions/setup-python@v4
2222
with:
23-
python-version: '3.10'
23+
python-version: '3.11'
2424
- uses: pre-commit/[email protected]
2525

2626
test:
2727
name: test on ${{ matrix.py }}
28-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-latest
2929
strategy:
3030
fail-fast: false
3131
matrix:
3232
py:
33+
- '3.11'
3334
- '3.10'
3435
- '3.9'
3536
- '3.8'
@@ -40,7 +41,7 @@ jobs:
4041
- name: setup python for tox
4142
uses: actions/setup-python@v4
4243
with:
43-
python-version: '3.10'
44+
python-version: '3.11'
4445
- name: install tox
4546
run: python -m pip install tox
4647
- name: setup python for test ${{ matrix.py }}
@@ -64,7 +65,7 @@ jobs:
6465

6566
check:
6667
name: check ${{ matrix.tox_env }}
67-
runs-on: ubuntu-20.04
68+
runs-on: ubuntu-latest
6869
strategy:
6970
fail-fast: false
7071
matrix:
@@ -73,10 +74,10 @@ jobs:
7374
- dev
7475
steps:
7576
- uses: actions/checkout@v4
76-
- name: setup Python 3.10
77+
- name: setup Python 3.11
7778
uses: actions/setup-python@v4
7879
with:
79-
python-version: '3.10'
80+
python-version: '3.11'
8081
- name: install tox
8182
run: python -m pip install tox
8283
- name: run check for ${{ matrix.tox_env }}
@@ -90,7 +91,7 @@ jobs:
9091
- name: setup python to build package
9192
uses: actions/setup-python@v4
9293
with:
93-
python-version: '3.10'
94+
python-version: '3.11'
9495
- name: install build
9596
run: python -m pip install build
9697
- uses: actions/checkout@v4
@@ -109,7 +110,7 @@ jobs:
109110
- name: setup python to build package
110111
uses: actions/setup-python@v4
111112
with:
112-
python-version: '3.10'
113+
python-version: '3.11'
113114
- name: install build
114115
run: python -m pip install build
115116
- uses: actions/checkout@v4

.pre-commit-config.yaml

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.1.0
3+
rev: v4.4.0
44
hooks:
55
- id: check-ast
66
- id: check-builtin-literals
@@ -12,56 +12,52 @@ repos:
1212
- id: end-of-file-fixer
1313
- id: trailing-whitespace
1414
- repo: https://github.com/asottile/pyupgrade
15-
rev: v2.29.1
15+
rev: v3.10.1
1616
hooks:
1717
- id: pyupgrade
18-
args: [ "--py36-plus" ]
18+
args: [ "--py37-plus" ]
1919
- repo: https://github.com/PyCQA/isort
2020
rev: 5.12.0
2121
hooks:
2222
- id: isort
2323
- repo: https://github.com/psf/black
24-
rev: 22.3.0
24+
rev: 23.7.0
2525
hooks:
2626
- id: black
2727
args: [ --safe ]
2828
- repo: https://github.com/asottile/blacken-docs
29-
rev: v1.12.0
29+
rev: 1.16.0
3030
hooks:
3131
- id: blacken-docs
32-
additional_dependencies: [ black==21.12b0 ]
33-
- repo: https://github.com/pre-commit/pygrep-hooks
34-
rev: v1.9.0
32+
additional_dependencies: [ black==23.7 ]
33+
- repo: https://github.com/tox-dev/pyproject-fmt
34+
rev: "1.1.0"
3535
hooks:
36-
- id: rst-backticks
36+
- id: pyproject-fmt
37+
additional_dependencies: ["tox>=4.11"]
3738
- repo: https://github.com/tox-dev/tox-ini-fmt
38-
rev: "0.5.1"
39+
rev: "1.3.1"
3940
hooks:
4041
- id: tox-ini-fmt
4142
args: [ "-p", "fix" ]
42-
- repo: https://github.com/asottile/setup-cfg-fmt
43-
rev: v1.20.0
44-
hooks:
45-
- id: setup-cfg-fmt
46-
args: [ --min-py3-version, "3.7", "--max-py-version", "3.10" ]
4743
- repo: https://github.com/PyCQA/flake8
48-
rev: 4.0.1
44+
rev: 6.1.0
4945
hooks:
5046
- id: flake8
5147
additional_dependencies:
52-
- flake8-bugbear==21.11.29
53-
- flake8-comprehensions==3.7
54-
- flake8-pytest-style==1.6
55-
- flake8-unused-arguments==0.0.9
56-
- flake8-noqa==1.2.1
57-
- pep8-naming==0.12.1
48+
- flake8-bugbear==23.7.10
49+
- flake8-comprehensions==3.14
50+
- flake8-pytest-style==1.7.2
51+
- flake8-unused-arguments==0.0.13
52+
- flake8-noqa==1.3.2
53+
- pep8-naming==0.13.3
5854
- repo: https://github.com/pre-commit/mirrors-mypy
5955
rev: v1.5.1
6056
hooks:
6157
- id: mypy
6258
exclude: ui-tests-ipw[78]\/.*
6359
additional_dependencies:
64-
- "pandas-stubs"
65-
- "types-Pygments"
66-
- "types-colorama"
67-
- "types-setuptools"
60+
- "pandas-stubs>=2.0.3.230814"
61+
- "types-Pygments>=2.16"
62+
- "types-colorama>=0.4.15.12"
63+
- "types-setuptools>=68.1.0.1"

ipydatagrid/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Copyright (c) Bloomberg.
22
# Distributed under the terms of the Modified BSD License.
33

4-
__version__ = "1.1.17"
4+
__version__ = "1.2.0"

ipydatagrid/datagrid.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,8 @@ def get_dataframe_index(self, dataframe):
512512
return "key"
513513

514514
def get_cell_value(self, column_name, primary_key_value):
515-
"""Gets the value for a single or multiple cells by column name and index name.
515+
"""Gets the value for a single or multiple cells by column name and
516+
index name.
516517
517518
Tuples should be used to index into multi-index columns."""
518519
row_indices = self._get_row_index_of_primary_key(primary_key_value)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ipydatagrid",
3-
"version": "1.1.17",
3+
"version": "1.2.0",
44
"description": "Fast Datagrid widget for the Jupyter Notebook and JupyterLab",
55
"keywords": [
66
"jupyter",

pyproject.toml

Lines changed: 42 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,57 @@
11
[build-system]
2+
build-backend = "hatchling.build"
23
requires = [
3-
"hatchling",
4-
"jupyterlab~=4.0",
4+
"hatchling>=1.18",
5+
"jupyterlab>=4.0.5",
56
]
6-
build-backend = "hatchling.build"
77

88
[project]
99
name = "ipydatagrid"
10+
version = "1.2.0"
1011
description = "Fast Datagrid widget for the Jupyter Notebook and JupyterLab"
1112
readme = "README.md"
12-
requires-python = ">=3.7"
13+
keywords = [
14+
"IPython",
15+
"Jupyter",
16+
"Widgets",
17+
]
1318
authors = [
1419
{ name = "Bloomberg" },
1520
]
16-
keywords = [
17-
"IPython",
18-
"Jupyter",
19-
"Widgets",
20-
]
21+
requires-python = ">=3.7"
2122
classifiers = [
22-
"Framework :: Jupyter",
23-
"Intended Audience :: Developers",
24-
"Intended Audience :: Science/Research",
25-
"License :: OSI Approved :: BSD License",
26-
"Programming Language :: Python",
27-
"Programming Language :: Python :: 3",
28-
"Programming Language :: Python :: 3 :: Only",
29-
"Programming Language :: Python :: 3.7",
30-
"Programming Language :: Python :: 3.8",
31-
"Programming Language :: Python :: 3.9",
32-
"Programming Language :: Python :: 3.10",
23+
"Framework :: Jupyter",
24+
"Intended Audience :: Developers",
25+
"Intended Audience :: Science/Research",
26+
"License :: OSI Approved :: BSD License",
27+
"Programming Language :: Python",
28+
"Programming Language :: Python :: 3 :: Only",
29+
"Programming Language :: Python :: 3.7",
30+
"Programming Language :: Python :: 3.8",
31+
"Programming Language :: Python :: 3.9",
32+
"Programming Language :: Python :: 3.10",
33+
"Programming Language :: Python :: 3.11",
3334
]
3435
dependencies = [
35-
"bqplot>=0.11.6",
36-
"ipywidgets>=7.6.0,<9",
37-
"pandas",
38-
"py2vega>=0.5.0",
36+
"bqplot>=0.11.6",
37+
"ipywidgets<9,>=7.6",
38+
"pandas>=1.3.5", # 1.3.5 is the last version supporting 3.7
39+
"py2vega>=0.5",
3940
]
40-
version = "1.1.17"
41-
42-
[project.license]
43-
file = "LICENSE.txt"
44-
45-
[project.optional-dependencies]
46-
test = [
47-
"nbval>=0.9",
48-
"pandas<=1.3.5",
49-
"pytest-cov>=3",
50-
"pytest>=6",
41+
optional-dependencies.test = [
42+
"nbval>=0.10",
43+
"pytest>=7.4",
44+
"pytest-cov>=4.1",
5145
]
52-
53-
[project.urls]
54-
Homepage = "https://github.com/bloomberg/ipydatagrid"
46+
urls.Homepage = "https://github.com/bloomberg/ipydatagrid"
47+
project.license = {file = "LICENSE.txt"}
5548

5649
[tool.hatch.build]
5750
artifacts = [
5851
"ipydatagrid/nbextension/index.*",
5952
"ipydatagrid/labextension",
6053
]
61-
62-
[tool.hatch.build.targets.wheel.shared-data]
63-
"ipydatagrid/nbextension" = "share/jupyter/nbextensions/ipydatagrid"
64-
"ipydatagrid/labextension" = "share/jupyter/labextensions/ipydatagrid"
65-
"ipydatagrid.json" = "etc/jupyter/nbconfig/notebook.d/ipydatagrid.json"
66-
67-
[tool.hatch.build.targets.sdist]
68-
exclude = [
54+
targets.sdist.exclude = [
6955
".github",
7056
"examples",
7157
"tests",
@@ -82,6 +68,11 @@ exclude = [
8268
"jest*",
8369
]
8470

71+
[tool.hatch.build.targets.wheel.shared-data]
72+
"ipydatagrid/nbextension" = "share/jupyter/nbextensions/ipydatagrid"
73+
"ipydatagrid/labextension" = "share/jupyter/labextensions/ipydatagrid"
74+
"ipydatagrid.json" = "etc/jupyter/nbconfig/notebook.d/ipydatagrid.json"
75+
8576
[tool.hatch.build.hooks.jupyter-builder]
8677
ensured-targets = [
8778
"ipydatagrid/nbextension/index.js",
@@ -99,6 +90,10 @@ npm = [
9990
"jlpm",
10091
]
10192

93+
[tool.black]
94+
line-length = 80
95+
exclude = "/(\n \\.eggs\n | \\.git\n | \\.hg\n | \\.mypy_cache\n | \\.tox\n | \\.venv\n | _build\n | buck-out\n | build\n | dist\n)/\n"
96+
10297
[tool.isort]
10398
profile = "black"
10499
known_first_party = [
@@ -113,18 +108,14 @@ disable = "C0330, C0326"
113108
[tool.pylint.format]
114109
max-line-length = "80"
115110

116-
[tool.black]
117-
line-length = 80
118-
exclude = "/(\n \\.eggs\n | \\.git\n | \\.hg\n | \\.mypy_cache\n | \\.tox\n | \\.venv\n | _build\n | buck-out\n | build\n | dist\n)/\n"
119-
120111
[tool.tbump]
121112
field = [
122113
{ name = "channel", default = "" },
123114
{ name = "release", default = "" },
124115
]
125116

126117
[tool.tbump.version]
127-
current = "1.1.17"
118+
current = "1.2.0"
128119
regex = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)((?P<channel>a|b|rc|.dev)(?P<release>\\d+))?"
129120

130121
[tool.tbump.git]

tox.ini

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
[tox]
2-
envlist =
2+
requires =
3+
tox>=4.2
4+
env_list =
35
fix
6+
py311
47
py310
58
py39
69
py38
710
py37
8-
py36
911
pypy3
1012
docs
1113
pkg_desc
12-
isolated_build = true
1314
skip_missing_interpreters = true
14-
minversion = 3.7
1515

1616
[testenv]
17+
package = wheel
18+
wheel_build_env = .pkg
1719
extras =
1820
test
1921
commands =
2022
pytest {tty:--color=yes} tests
2123
pytest --nbval examples
22-
package = wheel
23-
wheel_build_env = .pkg
2424

2525
[testenv:fix]
2626
description = format the code base to adhere to our styles, and complain about what we cannot do automatically
27-
passenv =
28-
PROGRAMDATA
2927
skip_install = true
3028
deps =
31-
pre-commit>=2
29+
pre-commit>=3.3.3
30+
pass_env =
31+
PROGRAMDATA
3232
commands =
3333
pre-commit run --all-files --show-diff-on-failure
3434

3535
[testenv:pkg_desc]
3636
description = check that the long description is valid
3737
skip_install = true
3838
deps =
39-
build[virtualenv]>=0.7
40-
twine>=3.7
39+
build[virtualenv]>=1
40+
twine>=4.0.2
4141
commands =
4242
python -m build --sdist --wheel . -o {envtmpdir}
4343
twine check {envtmpdir}/*
4444

4545
[testenv:dev]
4646
description = dev environment with all deps at {envdir}
47-
usedevelop = true
47+
package = editable
4848
extras =
4949
dev
5050
test

0 commit comments

Comments
 (0)