From de3432419fd258c11689cc4872aa3eda079ee874 Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Thu, 17 Mar 2022 13:27:45 -0400 Subject: [PATCH 1/6] Revert "move local_scheme from setup.py to pyproject.toml" This reverts commit d5e896843fb13ec3fe07ba5efd29564cc2bd735b. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5f0a238a..c7d0ef9c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,4 +7,3 @@ target-version = ["py35"] [tool.setuptools_scm] write_to = "rsconnect_jupyter/version.py" -local_scheme = "no-local-version" \ No newline at end of file From a06d202f90ac3276258571122192831a7eecae4c Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Thu, 17 Mar 2022 13:38:34 -0400 Subject: [PATCH 2/6] prevent runtime pipfile.lock from changing hash --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 65a7faf2..1f576587 100644 --- a/Makefile +++ b/Makefile @@ -64,6 +64,7 @@ test-selenium: # exported as a point of reference instead. .PHONY: dist dist: version-frontend + git reset --hard HEAD pipenv run python setup.py bdist_wheel pipenv run twine check $(BDIST_WHEEL) rm -vf dist/*.egg From e2e242fecc6cb2686cb568a2bfd71c9eb24f7c7d Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Thu, 17 Mar 2022 14:52:48 -0400 Subject: [PATCH 3/6] pin notebook to < 7.0.0 since it lacks nbextension --- Pipfile | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Pipfile b/Pipfile index 08d34fee..4e006dd2 100644 --- a/Pipfile +++ b/Pipfile @@ -21,7 +21,7 @@ traitlets = ">=5.1.1" [packages] nbconvert = ">=5.0" nbformat = "*" -notebook = ">=6.1.5" +notebook = ">=6.1.5, <7.0.0" rsconnect-python = ">=1.7.1" six = "*" # Dependabot fixes diff --git a/setup.cfg b/setup.cfg index d27b87c5..18794109 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,7 +17,7 @@ project_urls = [options] install_requires = rsconnect-python>=1.7.1 - notebook + notebook>=6.1.5,<7.0.0 nbformat nbconvert>=5.6.1 six From 1ae6476ff7257565f0a86b20b63e71044a239f0d Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Thu, 17 Mar 2022 15:53:13 -0400 Subject: [PATCH 4/6] Revert "prevent runtime pipfile.lock from changing hash" This reverts commit a06d202f90ac3276258571122192831a7eecae4c. --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 1f576587..65a7faf2 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,6 @@ test-selenium: # exported as a point of reference instead. .PHONY: dist dist: version-frontend - git reset --hard HEAD pipenv run python setup.py bdist_wheel pipenv run twine check $(BDIST_WHEEL) rm -vf dist/*.egg From 0f7ba62f3c1184bbcec9e50b6385c10f30255615 Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Thu, 17 Mar 2022 15:56:08 -0400 Subject: [PATCH 5/6] prevent runtime pipfile.lock from changing hash --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c26f915c..08aa4dd1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,6 +62,7 @@ jobs: - run: pipenv clean - run: pipenv install --skip-lock --dev - run: pipenv run pip install -U 'SecretStorage>=3' + - run: git reset --hard HEAD - run: make dist id: create_dist - uses: actions/upload-artifact@v2 From b5e4316955e3deaacf22eb0b35e9e423511d7a0d Mon Sep 17 00:00:00 2001 From: Bincheng Wu Date: Thu, 17 Mar 2022 16:30:06 -0400 Subject: [PATCH 6/6] pin notebook to <7.0 and deprecate Python2