Skip to content

ensure requirements.txt is included in the sdist, exclude performance and importable tests #207

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

Merged
merged 6 commits into from
May 25, 2023
Merged

ensure requirements.txt is included in the sdist, exclude performance and importable tests #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
060155c
ensure requirements.txt is included in the sdist
bollwyvl May 18, 2023
63851f2
exclude the performance package
bollwyvl May 18, 2023
987aab1
also exclude tests
bollwyvl May 18, 2023
7e82fc5
make tests an importable (but not installed) module, use relative imp…
bollwyvl May 18, 2023
19da4bd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 18, 2023
27e4455
include all tests in sdist
bollwyvl May 18, 2023
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
2 changes: 2 additions & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
include versioneer.py
include jupyterhub_traefik_proxy/_version.py
include requirements.txt
recursive-include tests *.*
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"Programming Language :: Python",
"Programming Language :: Python :: 3",
],
packages=find_packages(),
packages=find_packages(exclude=["performance", "tests"]),
include_package_data=True,
entry_points={
"jupyterhub.proxies": [
Expand Down
Empty file added tests/__init__.py
View file
Open in desktop
Empty file.
3 changes: 2 additions & 1 deletion tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from urllib.parse import urlparse

import pytest
import utils
from certipy import Certipy
from consul.aio import Consul
from jupyterhub.utils import exponential_backoff
Expand All @@ -24,6 +23,8 @@
from jupyterhub_traefik_proxy.fileprovider import TraefikFileProviderProxy
from jupyterhub_traefik_proxy.traefik_utils import deep_merge

from . import utils

HERE = Path(__file__).parent.resolve()
config_files = HERE / "config_files"

Expand Down
3 changes: 2 additions & 1 deletion tests/test_proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from urllib.parse import quote, urlparse

import pytest
import utils
import websockets
from jupyterhub.objects import Hub, Server
from jupyterhub.user import User
Expand All @@ -23,6 +22,8 @@

from jupyterhub_traefik_proxy.proxy import TraefikProxy

from . import utils

# Mark all tests in this file as slow
pytestmark = [pytest.mark.slow]

Expand Down