Skip to content

Commit b1388cf

Browse files
authored
Merge pull request #15 from navycut/develop
Develop
2 parents 000fe83 + cafc82e commit b1388cf

File tree

13 files changed

+69
-156
lines changed

13 files changed

+69
-156
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
Navycut is a high-level Python Web framework that encourages rapid development and clean, pragmatic design. Thanks for checking it out.
1313

14-
It's actually a Fullstack web framework using <a href="https://flask.palletsprojects.com">Flask(werkzeug)</a> as backend wsgi server and trying to deliver the service like Django does.
14+
It's actually a Full Stack web framework using <a href="https://flask.palletsprojects.com">Flask(werkzeug)</a> as backend wsgi server and try to deliver the service and api like Django.
1515

1616
The official documentation is online at <a href="navycut.github.io">navycut.github.io</a>.
1717

examples/aditi/migrations/env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from alembic import context
88

9-
from navycut.utils.console import Console
9+
from nc_console import Console
1010

1111
# this is the Alembic Config object, which provides
1212
# access to the values within the .ini file in use.

navycut/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
77
"""
88

9-
__version__ = '1.0.0'
9+
__version__ = '0.0.3'
1010
__author__ = "Aniket Sarkar"
1111

1212
def get_version(ctx=None, param=None):
1313
"""
1414
returns the default version.
1515
"""
16-
print (__version__)
1716
return __version__
1817

1918
def get_author():

navycut/cli/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
import click
1+
import click as c
22
from ._exec_cli import _create_boiler_project
33
from navycut import get_version
44

5-
@click.group()
5+
@c.group()
66
def _execute_from_command_line():
77
"""execute navycut commands from command line."""
88
pass
99

10-
@click.command()
11-
@click.argument('name')
10+
@c.command()
11+
@c.argument('name')
1212
def createproject(name):
1313
"""Create the navycut project at the specified directory."""
1414
_create_boiler_project(name)
1515

16-
@click.command()
16+
@c.command()
1717
def version():
18-
click.echo(get_version())
18+
c.echo(get_version())
1919

2020

2121

navycut/cli/_exec_cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from os import makedirs, listdir
22
from ..utils import path
3-
from ..utils.console import Console
3+
from nc_console import Console
44
from ..utils.tools import (generate_random_secret_key,
55
snake_to_camel_case
66
)

navycut/command/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from flask.globals import current_app
99
from ..cli._exec_cli import _create_boiler_app
1010
from ..utils.tools import get_default_username
11-
from ..utils.console import Console
11+
from nc_console import Console
1212
from ..core import app
1313
from ..contrib.decorators import with_appcontext
1414
from ..conf import settings

navycut/contrib/auth/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from datetime import datetime
33
from navycut.orm import sql
44
from navycut.utils.security import create_password_hash
5-
from navycut.utils.console import Console
5+
from nc_console import Console
66
import typing as t
77
from ..admin.site.views import NCAdminModelView
88

navycut/core/_reloader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import subprocess
66
import typing as t
77
from itertools import chain
8-
from ..utils.console import Console
8+
from nc_console import Console
99
from werkzeug._reloader import (ReloaderLoop as _ReloaderLoop,
1010
_get_args_for_reloading,
1111
_find_stat_paths,

navycut/core/_serving.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import typing as t
22
import socket
33
import os
4-
from ..utils.console import Console
4+
from nc_console import Console
55
from werkzeug.serving import (WSGIRequestHandler,
66
_TSSLContextArg,
77
get_interface_ip,

navycut/orm/sqla/migrator/templates/flask/env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from alembic import context
88

9-
from navycut.utils.console import Console
9+
from nc_console import Console
1010

1111
# this is the Alembic Config object, which provides
1212
# access to the values within the .ini file in use.

0 commit comments

Comments
 (0)