13308 Commits (cc39a28c07baa9a71ef2b698f147b819d48ef2aa)

 

All Branches   

Search

Author	SHA1	Message	Date
Nicolas Brichet	cc39a28c07	Adds translator to the NotebookShell (#6725) ... * Adds translator to the NotebookShell * move the translation plugin to application-extension * Update packages/application-extension/src/index.ts --------- Co-authored-by: Jeremy Tuloup <jeremy.tuloup@gmail.com>	3 years ago
Jeremy Tuloup	6e6ac276e7	Fix Playwright snapshot update workflow (#6724) ... * tmp: test updating UI * Update `test_folder` * try debug with workflow dispatch * try on push * fix * try more triggers * debug * Install pre-commit * run base setup * try disable git hooks * undo test changes	3 years ago
Jeremy Tuloup	32970b4417	Add workflow to update snapshots (#6723) ... * Add workflow to update snapshots * tmp: test ui change * Revert "tmp: test ui change" This reverts commit d964bf80e3.	3 years ago
pre-commit-ci[bot]	5e25c0b426	[pre-commit.ci] pre-commit autoupdate (#6714) ... * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/python-jsonschema/check-jsonschema: 0.19.2 → 0.21.0](https://github.com/python-jsonschema/check-jsonschema/compare/0.19.2...0.21.0) - [github.com/psf/black: 22.12.0 → 23.1.0](https://github.com/psf/black/compare/22.12.0...23.1.0) - [github.com/charliermarsh/ruff-pre-commit: v0.0.237 → v0.0.243](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.237...v0.0.243) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update .pre-commit-config.yaml --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Jeremy Tuloup <jeremy.tuloup@gmail.com>	3 years ago
Nicolas Brichet	905553e6dd	Resolving some accessibility issues (#6719) ... * Uses different ID for the running-session widgets, the one in main view and the one in panel * Append kernel logo image only if necessary * Add title to the button which close sidebar * Add landmarks roles * Fix UI-test * lint	3 years ago
Jeremy Tuloup	61b2ad27ea	Use Playwright `webServer` (#6720) ... * Use Playwright `webServer` * Try `jlpm start` * Lint	3 years ago
jtpio	ce9c16a01d	Publish 7.0.0a12 ... SHA256 hashes: jupyter-notebook-application-7.0.0-alpha.12.tgz: 414fcb66ff7121aa4b09cda3c9fd2d2c7434dd4f6d1bbb418621aba28cf91793 jupyter-notebook-application-extension-7.0.0-alpha.12.tgz: 907b69cf7f758b85a473ebe10dce2eb6353605e26d0f23fd2f6725d4498e7089 jupyter-notebook-console-extension-7.0.0-alpha.12.tgz: 8ebbdd75c6d030b14522deac0a91f9783bc1d95abb8404ef8fd54d2f315f8fda jupyter-notebook-docmanager-extension-7.0.0-alpha.12.tgz: 50c532fc1643b82e49517086f86dfff2674f5d9dad0f67596803d72ffba45790 jupyter-notebook-documentsearch-extension-7.0.0-alpha.12.tgz: 819c59dae9622a722a163d6d0274b73a284589c29f7b0335a0e700e95c6311eb jupyter-notebook-help-extension-7.0.0-alpha.12.tgz: a1bcf3d572f20a259eded9cd2ba57c60983c8d58b39ebc8886ab0e9a09be0700 jupyter-notebook-lab-extension-7.0.0-alpha.12.tgz: 5cc399e4b2caf51f6efd1e93cb42f93d9ebcdf4f5667a666430ab718f1e8e694 jupyter-notebook-notebook-extension-7.0.0-alpha.12.tgz: 9a4dae8106d33d650d90421845da5446b169202183e3e492b482fda2f52d4e2c jupyter-notebook-terminal-extension-7.0.0-alpha.12.tgz: a2f950fd24520498aa453773f482cda15f3819f75b93a805336cea4bcfdbf3ad jupyter-notebook-tree-7.0.0-alpha.12.tgz: 28c86eca269208044746306c2465a30ef27170ce316083b2f0db1abc4f7b605b jupyter-notebook-tree-extension-7.0.0-alpha.12.tgz: 40ac45036fd806404ea9f548d5e502698a60316209c692de786d62b28ac60999 jupyter-notebook-ui-components-7.0.0-alpha.12.tgz: 56632ffa21f0faf6827bdf0a2f4c4578f9fa8cf20124fded2fc3442f23d73e5d notebook-7.0.0a12-py3-none-any.whl: 1ae7783a166acdc053001dba85c3000a573a5e0fe76e04b3a11322dbac876470 notebook-7.0.0a12.tar.gz: 7f28ecfbed0d5ad45ae4498544f53e09c0bc246d0f55901e208c85561cc552a8	3 years ago
Jeremy Tuloup	27c2bfbb80	Update to JupyterLab 4.0.0a33 (#6713) ... * Update to JupyterLab 4.0.0a33 * Update Lumino packages * Update to React 18 * Fix default browser * Add defaultFileBrowser plugin * Update yarn.lock * Require Python 3.8 * Remove docprovider * Bump Python dependencies * Move Python bumps * Unbump `jupyterlab_server` * Align `jupyterlab_server`dep * Bump jupyterlab_server * Try with 3.10 * Manually set checkpoint text in UI tests * Fix checkpoints value in UI tests * Update snapshots	3 years ago
Steven Silvester	8ca2c1892b	Add more lint checks (#6706) ... * add more lint checks * fix lint	3 years ago
Lumír 'Frenzy' Balhar	229247f912	Reintroduce desktop file (#6705) ... * Reintroduce desktop file The desktop file was inadvertently removed in: 5b6ed99aec Fixes: https://github.com/jupyter/notebook/issues/6704 * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	3 years ago
jtpio	d87f41da04	Publish 7.0.0a11 ... SHA256 hashes: jupyter-notebook-application-7.0.0-alpha.11.tgz: 43fc448aef0e0971ebb528c983a7244499028bc21de8157793967d68bce59f52 jupyter-notebook-application-extension-7.0.0-alpha.11.tgz: 14553e2fa66f3b7d7147f103fc001f7ad7bdacea4b5cedb2d463ab0295088d8a jupyter-notebook-console-extension-7.0.0-alpha.11.tgz: dd811eeaace1700242edae6e3543996f4b0676f16811c8478db76583c235b7bf jupyter-notebook-docmanager-extension-7.0.0-alpha.11.tgz: 54e512f1e10530ae8cd2e00670a725af14b718ffde621f0b84d6177ea54143ca jupyter-notebook-documentsearch-extension-7.0.0-alpha.11.tgz: 8a12481cbaefe0dfcc7f48da0643b49024be1465e6d2014b87a6722cf6c3c579 jupyter-notebook-help-extension-7.0.0-alpha.11.tgz: c41ae544002a75e2907ce9e89ebd8cac466372e7dc3112544666251704a18500 jupyter-notebook-lab-extension-7.0.0-alpha.11.tgz: 3a9250504965a73173b62b2647d8de9946721e4c314f6b2a81690bac007932b8 jupyter-notebook-notebook-extension-7.0.0-alpha.11.tgz: 6a8c2e68f057ca6003047147abae1f8e7610f57e7fc2a9bb898e7b854fffab9d jupyter-notebook-terminal-extension-7.0.0-alpha.11.tgz: d81593481f4c51edabf2d034bb74e53ab377b53d0023429ae3bb82f22dbcf241 jupyter-notebook-tree-7.0.0-alpha.11.tgz: 834fd83e7089d9ee4420b09042627fe8ad033a1e77349203f8bdd964bcc14ce2 jupyter-notebook-tree-extension-7.0.0-alpha.11.tgz: aa4cbf17b4848561ba9dca12631fae6e3d13a475e56371e11fe31cfc613f8d20 jupyter-notebook-ui-components-7.0.0-alpha.11.tgz: dd90f2005f6f215b691fa2d7591770bc8f68add24db1d62cf4f9ac42853ab8ee notebook-7.0.0a11-py3-none-any.whl: c2bc660657886f7517b27fbbcc194bb193e204f9a26175bb1795eddad35a6191 notebook-7.0.0a11.tar.gz: df1c958abde60502925f6f64da27dd67a280417ca40214909a64c517b086cfde	3 years ago
Rosio	6d4eeed9d1	Help-extension split into multiple plugins (#6700) ... * help-extension split into multiple plugins * Update packages/help-extension/src/index.tsx Co-authored-by: Jeremy Tuloup <jeremy.tuloup@gmail.com> * rename schema json file Co-authored-by: Jeremy Tuloup <jeremy.tuloup@gmail.com>	3 years ago
Steven Silvester	4e6282c1e5	Add releaser workflows (#6698) ... * add releaser workflows * add workflow files	3 years ago
Jeremy Tuloup	7b82dbbdf6	Create auto_author_assign.yml (#6696)	3 years ago
Jeremy Tuloup	ffc7d8dcc3	Fix console error when adding a widget to a side panel (#6694) ... * Fix console error when adding a widget to a side panel * Remove child-added logic	3 years ago
Jeremy Tuloup	7eb832d6ac	Fix environment activation on Gitpod (#6693)	3 years ago
Jeremy Tuloup	534b6f67fd	Add back `# type:ignore` (#6695) ... * Add back `# type:ignore` * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	3 years ago
Jeremy Tuloup	df4a6bfc55	Add the Settings Editor to the landing page (#6316) ... * Add the Settings Editor to the landing page * Fix tab panel tabs * Do not include JSON editor for now * Hide Settings Editor command from the menu * Update yarn.lock * Fix integrity * Fix yarn.lock and resolutions * Update yarn.lock * Allow adding and closing the settings editor * Do not include JSON editor for now * Update snapshots * More snapshot updates * More snapshot update * Fix resolutions	3 years ago
Nicolas Brichet	a0b3a8088c	Tree view enhancement (#6588) ... * Opens by default the newly created tab in tree view * Adds a command to open the file browser when in tree view, which also fixes the broken menu entry 'file Browser' in view * (1) Remove the menu entry 'Open Files' in tree view, which was opening a new browser tab with the same contents, and was like a duplication of 'File Browser' entry, and (2) rename the menu entry 'Open Files' to 'File Browser' for consistency * Add test on 'File Browser' menu entry * Fix pre-commit * Fix test on File Browser menu entry * update snapshots of view menu * Do not activate newly created tree tab by default * Do not add 'openTree' command if it already exists (meaning that the current page contains a filebrowser plugin) * Wait for the file browser commands from JupyterLab to be fully created before create a new one * File Browser menu entry execution depends on the current page ('tree' or other) * Add the dependency to @jupyter-notebook/tree in application-extension * Fix typo * Remove dependency to tree in application-extension * Clean unused dependency * Delete a remaining comment	3 years ago
jtpio	69bc21f0b9	Publish 7.0.0a10 ... SHA256 hashes: jupyter-notebook-application-7.0.0-alpha.10.tgz: 8b2c34f2e355d95528ed0c4e80cb01ab1a12419b37ae7ade39ec3d4f88518d86 jupyter-notebook-application-extension-7.0.0-alpha.10.tgz: 69f4998efa6c0f44160902f071de2673c5287cd2fae2b857271bdef4fda24328 jupyter-notebook-console-extension-7.0.0-alpha.10.tgz: 350e90fb7b60735596dde4f95b299fbaf21cd5a6a1a0563da99525ecd596f3e3 jupyter-notebook-docmanager-extension-7.0.0-alpha.10.tgz: ee2513eb86b3531e22fc9a73a942208aa6648bbdc599128b72b3eec2727004b8 jupyter-notebook-documentsearch-extension-7.0.0-alpha.10.tgz: 12b88c065ca98617de57c6974f5c2e8974c62b4ab2b2e3a1a2d0612ea04b874b jupyter-notebook-help-extension-7.0.0-alpha.10.tgz: ff449691e4f4dec06d7593cd1e5885d96f856aa56f9f28754214795255e2e5fa jupyter-notebook-lab-extension-7.0.0-alpha.10.tgz: 6be1ecbfe5a44ce1b6cb82806f2daf84906dee4277621db39547cc0d83bbdb29 jupyter-notebook-notebook-extension-7.0.0-alpha.10.tgz: 479c44646d11e29da5f1a9c3412351c3d8dea39512e51806f0d57b78eaf510b0 jupyter-notebook-terminal-extension-7.0.0-alpha.10.tgz: 42310512763b36453b1d2cb1bae658703a2ccdeea1c95285a13f7c124e3e8402 jupyter-notebook-tree-7.0.0-alpha.10.tgz: 1d17fb7f6538c60c247b7e6c67659d5035ca765e29b21fc846394cb6bda64a5b jupyter-notebook-tree-extension-7.0.0-alpha.10.tgz: 32e9e7f84fb500d824c89bbce245f4bb4665d70a50636bf78bb4febbe9518636 jupyter-notebook-ui-components-7.0.0-alpha.10.tgz: 5d35a91bacb989db838f94fb46d7ae5ed929b6c5374609b57137b3a8d298ab8e notebook-7.0.0a10-py3-none-any.whl: d01ad89a5efa5686357b1055d1395d1e0769b65eca06d167eded6ae20c25081f notebook-7.0.0a10.tar.gz: c7eb4cd9abcd31d4c2b45ae79b7188970c83c4083f8a5f6c346c845a755f66e5	3 years ago
Jeremy Tuloup	6205bf376f	Update to JupyterLab 4.0.0a32 (#6678) ... * Update packages to JupyterLab 4.0.0a32 * Update python dependency * Update `@jupyterlab/galata` * Require `jupyter_server>=2.0.1,<3` * Undo `jupyter_server` bump for now * Update to Jest 29 * More jest fixes * Update to the latest Lumino * Fix yarn.lock * Fix JSON background color * Update snapshots	3 years ago
dependabot[bot]	80db6bdd8a	Bump json5 from 1.0.1 to 1.0.2 (#6681) ... Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
dependabot[bot]	84579902e4	Bump json5 from 2.2.1 to 2.2.3 in /ui-tests (#6684) ... Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.3. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v2.2.1...v2.2.3) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
Jeremy Tuloup	7b56452c01	Update the copyright date to 2023 in the about dialog (#6679)	3 years ago
pre-commit-ci[bot]	98b04bea69	[pre-commit.ci] pre-commit autoupdate (#6674) ... updates: - [github.com/psf/black: 22.10.0 → 22.12.0](https://github.com/psf/black/compare/22.10.0...22.12.0) - [github.com/charliermarsh/ruff-pre-commit: v0.0.189 → v0.0.207](https://github.com/charliermarsh/ruff-pre-commit/compare/v0.0.189...v0.0.207) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	3 years ago
Jeremy Tuloup	4051c5eea4	Fix `check_links` and and `Test Lint` CI failures (#6675) ... * Fix check links * Remove `type:ignore`	3 years ago
Steven Silvester	840b4256da	Add spelling and docstring enforcement (#6669) ... * add spelling and docstring enforcement * remove markdown format * restore local hooks * add docs change * spelling	3 years ago
Steven Silvester	48fb973071	CI Cleanup (#6667) ... * ci cleanup * lint * run ui tests on ubuntu 20.04	3 years ago
Steven Silvester	22475a39ab	Adopt ruff and typing (#6658) ... * adopt ruff and typing * reinstate local hooks * fix classifier * fix lint * limit ruff target * fix doc8 test * add integrity check * lint * lint * only use mdformat for changelog * prettier	3 years ago
pre-commit-ci[bot]	0b99dcc820	[pre-commit.ci] pre-commit autoupdate (#6655) ... updates: - [github.com/john-hen/Flake8-pyproject: 1.2.1 → 1.2.2](https://github.com/john-hen/Flake8-pyproject/compare/1.2.1...1.2.2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	3 years ago
dependabot[bot]	aab0711a54	Bump decode-uri-component from 0.2.0 to 0.2.2 (#6651) ... Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
dependabot[bot]	d4576e8734	Bump dessant/lock-threads from 3 to 4 (#6650) ... Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads) from 3 to 4. - [Release notes](https://github.com/dessant/lock-threads/releases) - [Changelog](https://github.com/dessant/lock-threads/blob/master/CHANGELOG.md) - [Commits](https://github.com/dessant/lock-threads/compare/v3...v4) --- updated-dependencies: - dependency-name: dessant/lock-threads dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	3 years ago
Jeremy Tuloup	dd77e50097	Fix issue template formatting (#6626) ... * Fix issue template formatting * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Add additional mdformat plugins * Fix bug_report.md Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	3 years ago
pre-commit-ci[bot]	746785f79d	[pre-commit.ci] pre-commit autoupdate (#6647) ... updates: - [github.com/pre-commit/pre-commit-hooks: v4.3.0 → v4.4.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.3.0...v4.4.0) - [github.com/john-hen/Flake8-pyproject: 1.2.0 → 1.2.1](https://github.com/john-hen/Flake8-pyproject/compare/1.2.0...1.2.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	3 years ago
Jeremy Tuloup	bc6b6722d9	Remove PDF link to Jupyter Notebook docs (#6648)	3 years ago
Jeremy Tuloup	e9e5c891e3	Update to TypeScript 4.9 (#6640)	3 years ago
Steven Silvester	778ecc5551	Add more Python tests (#6639)	3 years ago
Steven Silvester	581f98c38f	use main branch for config (#6638)	3 years ago
Steven Silvester	62977896e0	Clean up workflows (#6635)	3 years ago
Jeremy Tuloup	b508a7e25b	Merge pull request #6634 from jupyter/pre-commit-ci-update-config ... [pre-commit.ci] pre-commit autoupdate	3 years ago
pre-commit-ci[bot]	4dcfe4f721	[pre-commit.ci] pre-commit autoupdate ... updates: - [github.com/john-hen/Flake8-pyproject: 1.1.0.post0 → 1.2.0](https://github.com/john-hen/Flake8-pyproject/compare/1.1.0.post0...1.2.0) - [github.com/python-jsonschema/check-jsonschema: 0.19.1 → 0.19.2](https://github.com/python-jsonschema/check-jsonschema/compare/0.19.1...0.19.2)	3 years ago
Jeremy Tuloup	1b50ded5a9	Merge pull request #6631 from blink1073/ci-cleanup ... CI Cleanup	3 years ago
Steven Silvester	8ccc516d7b	increase timeout	3 years ago
Steven Silvester	0386e69efb	increase pytest version	3 years ago
jtpio	aa0429881e	Publish 7.0.0a9 ... SHA256 hashes: jupyter-notebook-application-7.0.0-alpha.9.tgz: cdc301c067e5583a443fdbf3925959845fef7e870c51b8cc2f374451543919a6 jupyter-notebook-application-extension-7.0.0-alpha.9.tgz: f862bf9884952070f0f8af21f4c4bea26e0275948364903843b3fa3a0ca97bd3 jupyter-notebook-console-extension-7.0.0-alpha.9.tgz: f03a4ff061e14f30280bb48a4e8e959baf4170b2f59be193534ae2e219fa40ba jupyter-notebook-docmanager-extension-7.0.0-alpha.9.tgz: 3aa886c55828b79c122609cb3bebe64d0f8ba5f3f805fce276967f361d31e799 jupyter-notebook-documentsearch-extension-7.0.0-alpha.9.tgz: 1ddea9ceda0a5856ffd0d93a01a57e7999f6a2d3946c5e28976bf61e2b796f7f jupyter-notebook-help-extension-7.0.0-alpha.9.tgz: d93f160daf480ce205251d9d97ce1f29eb7b084523332e84eef38b4581713cfa jupyter-notebook-lab-extension-7.0.0-alpha.9.tgz: 77570e00d7f6474cbdf86466a862791081e1569070d04c4eddf9e820c29aaeb7 jupyter-notebook-notebook-extension-7.0.0-alpha.9.tgz: a5ceda82dd86d1df184a87e19f2f088a2adb01059cfe9fdfad35832a2e8cd3b4 jupyter-notebook-terminal-extension-7.0.0-alpha.9.tgz: 93be8193418711a981cc37c9de93ef33f3c8f373db360f15b441a30a28047776 jupyter-notebook-tree-7.0.0-alpha.9.tgz: 9763463fee3563eea0777c16e0a0f74de0b5cb7be53c9f402226034e309e9d17 jupyter-notebook-tree-extension-7.0.0-alpha.9.tgz: 65cc9bc6b481036bbfc08f255585e69e6d00a5175969b40c190570e998eff2f6 jupyter-notebook-ui-components-7.0.0-alpha.9.tgz: d35ede0cd4abc077d6ad055bf814319338b00c0208ff0c80b14b4e9410c28b69 notebook-7.0.0a9-py3-none-any.whl: 282e1bb8c6e2836995135220e7e21001a6b784b5664881b1ca711c7186bcc579 notebook-7.0.0a9.tar.gz: 2dccc5cbcdebd3a223da76e93c305eec544d42ae0139f4120ab80e911adcd5a0	3 years ago
Jeremy Tuloup	b7ba0592f2	Merge branch 'main' into ci-cleanup	3 years ago
Jeremy Tuloup	b4006ce47b	Merge pull request #6629 from gabalafou/run-p ... Add run-p (npm-run-all) to dev dependencies	3 years ago
gabalafou	5c3d032176	Add run-p (npm-run-all) to dev dependencies	3 years ago
Jeremy Tuloup	e4b91ec058	Merge pull request #6627 from jtpio/update-latest-lab ... Update to JupyterLab 4.0.0a31	3 years ago
Steven Silvester	ec6874ccb5	more cleanup	3 years ago