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 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/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 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