From e01ac6208b46996c20ef57bafebb57cd8ee9a438 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Wed, 13 Dec 2023 10:03:38 -0500 Subject: [PATCH 1/3] =?UTF-8?q?Bump=20version:=200.4.1=20=E2=86=92=201.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- js/package.json | 2 +- jupyterfs/_version.py | 2 +- pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b1d8bbf..bbb5c7b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.4.1 +current_version = 1.0.0 commit = True tag = False diff --git a/js/package.json b/js/package.json index 35ec59c..9d5e02d 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "jupyter-fs", - "version": "0.4.1", + "version": "1.0.0", "description": "A Filesystem-like mult-contents manager backend for Jupyter", "author": "The jupyter-fs authors", "license": "Apache-2.0", diff --git a/jupyterfs/_version.py b/jupyterfs/_version.py index b37c776..bb7338d 100644 --- a/jupyterfs/_version.py +++ b/jupyterfs/_version.py @@ -1,4 +1,4 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -__version__ = "0.4.1" +__version__ = "1.0.0" diff --git a/pyproject.toml b/pyproject.toml index bfeef50..47b9804 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ build-backend = "hatchling.build" [project] name = "jupyter-fs" description = "A Filesystem-like mult-contents manager backend for Jupyter" -version = "0.4.1" +version = "1.0.0" readme = "README.md" license = { file = "LICENSE" } requires-python = ">=3.7" From a4c3bde7ce27410cea7c09354c54b8698e77470b Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Thu, 21 Dec 2023 16:27:41 -0500 Subject: [PATCH 2/3] Fix wheel package for newer hatch build --- pyproject.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 47b9804..2e06198 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -111,6 +111,10 @@ exclude = [ "docs", ] +[tool.hatch.build.targets.wheel] +packages = ["jupyterfs"] + + [tool.hatch.build.hooks.jupyter-builder] build-function = "hatch_jupyter_builder.npm_builder" ensured-targets = [ From 3530baad1e28ff91187a0de430a5d3ee16f50098 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Thu, 21 Dec 2023 16:46:00 -0500 Subject: [PATCH 3/3] move to new docker compose --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fdcd4c7..0616ecb 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ build: ## build python/javascript python -m build . develop: ## install to site-packages in editable mode - python -m pip install --upgrade build docker-compose jupyterlab pip setuptools twine wheel + python -m pip install --upgrade build jupyterlab pip setuptools twine wheel python -m pip install -vvv .[develop] install: ## install to site-packages @@ -40,13 +40,13 @@ teardown-infra-win: teardown-infra-common: dockerup: - ${DOCKER}-compose -f ci/docker-compose.yml up -d + ${DOCKER} compose -f ci/docker-compose.yml up -d dockerdown: - ${DOCKER}-compose -f ci/docker-compose.yml down || echo "can't teardown docker compose" + ${DOCKER} compose -f ci/docker-compose.yml down || echo "can't teardown docker compose" dockerlogs: - ${DOCKER}-compose -f ci/docker-compose.yml logs + ${DOCKER} compose -f ci/docker-compose.yml logs testpy: ## Clean and Make unit tests python -m pytest -v jupyterfs/tests --junitxml=junit.xml --cov=jupyterfs --cov-report=xml:.coverage.xml --cov-branch --cov-fail-under=20 --cov-report term-missing