Merge pull request #322 from rstudio/bcwu-fix-ci-versioning

fix ci tag versioning
rstudio · Mar 18, 2022 · ca25985 · ca25985
2 parents 07daae8 + b5e4316
commit ca25985
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git 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

diff --git 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/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"
diff --git 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