Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix ci tag versioning #322

Merged
merged 6 commits into from
Mar 18, 2022
Merged

fix ci tag versioning #322

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de34324
Revert "move local_scheme from setup.py to pyproject.toml"
bcwu Mar 17, 2022
a06d202
prevent runtime pipfile.lock from changing hash
bcwu Mar 17, 2022
e2e242f
pin notebook to < 7.0.0 since it lacks nbextension
bcwu Mar 17, 2022
1ae6476
Revert "prevent runtime pipfile.lock from changing hash"
bcwu Mar 17, 2022
0f7ba62
prevent runtime pipfile.lock from changing hash
bcwu Mar 17, 2022
b5e4316
pin notebook to <7.0 and deprecate Python2
bcwu Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ test-selenium:
# exported as a point of reference instead.
.PHONY: dist
dist: version-frontend
git reset --hard HEAD
bcwu marked this conversation as resolved.
Show resolved Hide resolved
pipenv run python setup.py bdist_wheel
pipenv run twine check $(BDIST_WHEEL)
rm -vf dist/*.egg
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ target-version = ["py35"]

[tool.setuptools_scm]
write_to = "rsconnect_jupyter/version.py"
local_scheme = "no-local-version"
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ project_urls =
[options]
install_requires =
rsconnect-python>=1.7.1
notebook
notebook>=6.1.5,<7.0.0
bcwu marked this conversation as resolved.
Show resolved Hide resolved
nbformat
nbconvert>=5.6.1
six
Expand Down