Include Tests in Sdist But Not Wheel

.github/workflows/downstream.yml

@@ -7,7 +7,7 @@ on:
     branches: "*"
 
 jobs:
-  tests:
+  downstream:
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
@@ -22,4 +22,5 @@ jobs:
         uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
         with:
           package_name: jupyterlab
+          package_spec: "\".[test]\""
           test_command: "python -m jupyterlab.browser_check --no-browser-test"

.github/workflows/tests.yml

@@ -62,7 +62,7 @@ jobs:
       - name: Run python tests
         # See `setup.cfg` for full test options
         run: |
-          pytest --pyargs jupyterlab_server
+          pytest
       - name: Upload coverage
         run: |
           codecov

MANIFEST.in

@@ -2,14 +2,13 @@ include *.md
 include LICENSE
 include jupyterlab_server/rest-api.yml
 include jupyterlab_server/templates/*.html
-recursive-include jupyterlab_server/tests *.json *.json.orig *.jupyterlab-workspace
+recursive-include tests *.*
 recursive-include docs *.*
+
 include docs/Makefile
 
 prune docs/build
-
-# prune translation test data to avoid long path limits on Windows
-prune jupyterlab_server/tests/translations
+recursive-exclude tests/translations/**/build *.*
 
 # Patterns to exclude from any directory
 global-exclude *~

pyproject.toml

@@ -7,7 +7,7 @@ skip = ["check-links"]
 
 [tool.check-manifest]
 ignore = ["tbump.toml", ".*", "*.yml", "docs/source/api/app-config.rst", "docs/source/changelog.md"]
-ignore-bad-ideas = ["jupyterlab_server/tests/translations/**/*.mo"]
+ignore-bad-ideas = ["tests/translations/**/*.mo"]
 
 [tool.tbump.version]
 current = "2.10.3"

setup.cfg

@@ -41,4 +41,6 @@ install_requires =
 test = codecov; ipykernel; pytest>=5.3.2; pytest-cov; jupyter_server[test]; openapi_core~=0.14.0; pytest-console-scripts; strict-rfc3339; ruamel.yaml; wheel
 
 [options.packages.find]
-exclude = ['docs*']
+exclude =
+    docs*
+    tests*

jupyterlab_server/pytest_plugin.py → tests/conftest.py

@@ -19,6 +19,8 @@ def mkdir(tmp_path, *parts):
         path.mkdir(parents=True)
     return path
 
+HERE = os.path.abspath(os.path.dirname(__file__))
+
 app_settings_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, 'app_settings'))
 user_settings_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, 'user_settings'))
 schemas_dir = pytest.fixture(lambda tmp_path: mkdir(tmp_path, 'schemas'))
@@ -85,8 +87,7 @@ def _make_labserver_extension_app(**kwargs):
 
     # Copy the schema files.
     src = pjoin(
-        os.path.abspath(os.path.dirname(__file__)),
-        'tests',
+        HERE,
         'schemas',
         '@jupyterlab')
     dst = pjoin(str(schemas_dir), '@jupyterlab')
@@ -99,8 +100,7 @@ def _make_labserver_extension_app(**kwargs):
         target_name = name + '-federated'
         target = pjoin(str(labextensions_dir), '@jupyterlab', target_name)
         src = pjoin(
-            os.path.abspath(os.path.dirname(__file__)),
-            'tests',
+            HERE,
             'schemas',
             '@jupyterlab',
             name)
@@ -114,8 +114,7 @@ def _make_labserver_extension_app(**kwargs):
 
     # Copy the overrides file.
     src = pjoin(
-        os.path.abspath(os.path.dirname(__file__)),
-        'tests',
+        HERE,
         'app-settings',
         'overrides.json')
     dst = pjoin(str(app_settings_dir), 'overrides.json')
@@ -125,8 +124,7 @@ def _make_labserver_extension_app(**kwargs):
 
     # Copy workspaces.
     data = pjoin(
-        os.path.abspath(os.path.dirname(__file__)),
-        'tests',
+        HERE,
         'workspaces')
     for item in os.listdir(data):
         src = pjoin(data, item)

jupyterlab_server/tests/test_licenses_api.py → tests/test_licenses_api.py

@@ -8,8 +8,9 @@
 import pytest
 import mistune
 
-from .. import LicensesApp
-from ..licenses_handler import DEFAULT_THIRD_PARTY_LICENSE_FILE, LicensesManager
+from jupyterlab_server import LicensesApp
+from jupyterlab_server.licenses_handler import DEFAULT_THIRD_PARTY_LICENSE_FILE, LicensesManager
+
 
 # utilities
 

jupyterlab_server/tests/test_translation_api.py → tests/test_translation_api.py

@@ -8,7 +8,7 @@
 import sys
 
 from .utils import expected_http_error
-from ..translation_utils import (_get_installed_language_pack_locales,
+from jupyterlab_server.translation_utils import (_get_installed_language_pack_locales,
                                  _get_installed_package_locales,
                                  get_display_name,
                                  get_installed_packages_locale,

jupyterlab_server/tests/utils.py → tests/utils.py

@@ -96,7 +96,7 @@ def wrap_response(response):
 
 def validate_request(response):
     """Validate an API request"""
-    path = (Path(__file__) / '../../rest-api.yml').resolve()
+    path = (Path(here) / '../jupyterlab_server/rest-api.yml').resolve()
     yaml = YAML(typ='safe')
     spec_dict = yaml.load(path.read_text(encoding='utf-8'))
     spec = create_spec(spec_dict)