diff --git a/conftest.py b/conftest.py new file mode 100644 index 0000000..522420c --- /dev/null +++ b/conftest.py @@ -0,0 +1,33 @@ +import pytest + + +pytest_plugins = [ + "jupyter_server.pytest_plugin" +] + + +def pytest_addoption(parser): + parser.addoption( + "--integration_tests", + default=False, + type=bool, + help="only run tests with the 'integration_test' pytest mark.", + ) + + +def pytest_configure(config): + # register an additional marker + config.addinivalue_line( + "markers", "integration_test" + ) + + +def pytest_runtest_setup(item): + is_integration_test = any(mark for mark in item.iter_markers(name="integration_test")) + + if item.config.getoption("--integration_tests") is True: + if not is_integration_test: + pytest.skip("Only running tests marked as 'integration_test'.") + else: + if is_integration_test: + pytest.skip("Skipping this test because it's marked 'integration_test'. Run integration tests using the `--integration_tests` flag.") diff --git a/jupyter_server-1.10.2.tar.gz b/jupyter_server-1.10.2.tar.gz new file mode 100644 index 0000000..b0a1f3b --- /dev/null +++ b/jupyter_server-1.10.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3a3b68ebc6d7bfee1097f1712cf7709ee39c92379da2cc08724515bb85e72bf +size 417665 diff --git a/jupyter_server-1.9.0.tar.gz b/jupyter_server-1.9.0.tar.gz deleted file mode 100644 index 1f8b017..0000000 --- a/jupyter_server-1.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d19006380f6217458a9db309b54e3dab87ced6c06329c61823907bef2a6f51b -size 414622 diff --git a/python-jupyter-server.changes b/python-jupyter-server.changes index 6ea176c..9389f9f 100644 --- a/python-jupyter-server.changes +++ b/python-jupyter-server.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon Aug 16 12:39:42 UTC 2021 - Ben Greiner + +- Update to 1.10.2 + * fix: make command line aliases work again #564 + * decode bytes from secure cookie #562 + * Maintenance and upkeep improvements + * Add the needed space in the welcome message #561 + * Update check-release workflow #558 + * Fix typo in allow_password_change help #559 +- Release notes for v1.10.1 + * Protect against unset spec #556 +- Release notes for v1.10.0 + * PR: Add a new preferred-dir traitlet #549 + * stop hook for extensions #526 + * extensions: allow extensions in namespace packages #523 + * Fix examples/simple test execution #552 + * Rebuild package-lock, fixing local setup #548 + * small test changes #541 +- Add conftest.py missing from release tarball + ------------------------------------------------------------------- Sat Jun 26 14:27:09 UTC 2021 - Ben Greiner diff --git a/python-jupyter-server.spec b/python-jupyter-server.spec index efa70df..f1d171b 100644 --- a/python-jupyter-server.spec +++ b/python-jupyter-server.spec @@ -19,13 +19,16 @@ %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 Name: python-jupyter-server -Version: 1.9.0 +Version: 1.10.2 Release: 0 Summary: The backend to Jupyter web applications License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/jupyter-server/jupyter_server +# need the release tarball for the static stylesheets Source: https://github.com/jupyter-server/jupyter_server/releases/download/v%{version}/jupyter_server-%{version}.tar.gz +# conftest.py is not in release tarball but required for tests +Source1: https://github.com/jupyter-server/jupyter_server/raw/v%{version}/conftest.py BuildRequires: %{python_module Jinja2} BuildRequires: %{python_module Send2Trash} BuildRequires: %{python_module anyio >= 3.1.0} @@ -70,10 +73,10 @@ Provides: python-jupyter_server = %{version}-%{release} Obsoletes: python-jupyter_server < %{version}-%{release} # SECTION extras_require test BuildRequires: %{python_module ipykernel} +BuildRequires: %{python_module pytest >= 6} BuildRequires: %{python_module pytest-console-scripts} BuildRequires: %{python_module pytest-mock} BuildRequires: %{python_module pytest-tornasync} -BuildRequires: %{python_module pytest} BuildRequires: %{python_module requests} # /SECTION %if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" @@ -91,6 +94,7 @@ languages, sharing, and interactive widgets. %prep %setup -q -n jupyter_server-%{version} +cp %{SOURCE1} ./ %build %python_build