Skip to content
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

Add --app-dir option for running uvicorn from any location #619

Merged
merged 14 commits into from
Jun 9, 2020
Merged

Add --app-dir option for running uvicorn from any location #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7973a0e
Add '--app-dir' option to specify application directory when running …
yezyilomo Apr 9, 2020
669ec94
Add documentation for '--app-dir' option
yezyilomo Apr 9, 2020
815e956
Format code with black
yezyilomo Apr 9, 2020
c4ee856
Update docs/settings.md
yezyilomo Apr 10, 2020
06f45b6
Remove --app-dir from application settings section
yezyilomo Apr 10, 2020
de57311
Update --app-dir help message and set show_default=True
yezyilomo Apr 10, 2020
6f60120
Update --app-dir description
yezyilomo Apr 10, 2020
44b8dc2
Merge branch 'master' into add_app-dir_option_for_running_uvicorn_fro…
yezyilomo May 21, 2020
5c398a0
Merge branch 'master' into add_app-dir_option_for_running_uvicorn_fro…
yezyilomo Jun 9, 2020
582e664
Rephrase --app-dir help text
yezyilomo Jun 9, 2020
d87000d
Rephrase --app-dir help text
yezyilomo Jun 9, 2020
9120572
Edit --app-dir help text
yezyilomo Jun 9, 2020
dd63a40
Update main.py
tomchristie Jun 9, 2020
4e0565e
Update deployment.md
tomchristie Jun 9, 2020
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
3 changes: 3 additions & 0 deletions docs/deployment.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ Options:
[default: TLSv1]
--header TEXT Specify custom default HTTP response headers
as a Name:Value pair
--app-dir TEXT Look for APP in the specified directory, by
adding this to the PYTHONPATH. Defaults to
the current working directory.
--help Show this message and exit.
```

Expand Down
10 changes: 9 additions & 1 deletion uvicorn/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,13 @@ def print_version(ctx, param, value):
is_eager=True,
help="Display the uvicorn version and exit.",
)
@click.option(
"--app-dir",
"app_dir",
default=".",
show_default=True,
help="Look for APP in the specified directory, by adding this to the PYTHONPATH. Defaults to the current working directory.",
)
def main(
app,
host: str,
Expand Down Expand Up @@ -290,8 +297,9 @@ def main(
ssl_ciphers: str,
headers: typing.List[str],
use_colors: bool,
app_dir: str,
):
sys.path.insert(0, ".")
sys.path.insert(0, app_dir)

kwargs = {
"app": app,
Expand Down