Skip to content

Commit

Permalink
Merge pull request #77 from marktennyson/develop-mark
Browse files Browse the repository at this point in the history
bump version 0.0.4 => 0.0.5
  • Loading branch information
marktennyson authored Oct 25, 2021
2 parents 07d2878 + 968eca5 commit dc11eed
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 13 deletions.
13 changes: 11 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,14 @@
- Added flask-mailman for the default mail service.
- Added flask-express for expressJs like service.

#### Bug fixes
- Added flask-express 0.1.2 to fix the issue releated to the admin panel.
#### Bug Fixes
- Added flask-express 0.1.2 to fix the issue releated to the admin panel.

## [0.0.5]

#### Changed
- Changed the check version system. Now anybody can get the `Navycut` version by simply executing this command: `navycut -V` or `navycut --version`

#### Bug Fixes
- Fixed static_server not working issue.
- Fixed paytm logo not found issue.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ python3 setup.py install

### check for installation
```bash
navycut version
0.0.3
navycut --version
0.0.5
```

### Introduction to Navycut
Expand Down Expand Up @@ -338,7 +338,7 @@ admin.register_model(Author, AuthorAdminModelView) # Use the customized options
</a>
<br>
<a href="https://paytm.me/vA-DF7O">
<img src="https://www.searchpng.com/wp-content/uploads/2019/02/Paytm-Logo-With-White-Border-PNG-image.png" height="50px" width="100px">
<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/2/24/Paytm_Logo_%28standalone%29.svg/1200px-Paytm_Logo_%28standalone%29.svg.png" height="50px" width="100px">
</a>

### Contributors
Expand Down
2 changes: 1 addition & 1 deletion examples/aditi/aniket/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Blog(sql.Model):
class Author(sql.Model):
# id = sql.fields.Integer(pk=True, unique=True)
name = sql.fields.Char(required=True, unique=True)
picture = sql.fields.Image(required=True)
picture = sql.fields.Image(required=False)
is_active = sql.fields.Boolean(default=True)

class ExtraUser(sql.Model):
Expand Down
Binary file added examples/aditi/uploads/images/1609533479162.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions navycut/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"""
version_info = (0, 0, 4)
version_info = (0, 0, 5)


__version__ = ".".join([str(v) for v in version_info])
__author__ = "Aniket Sarkar"

def get_version(ctx=None, param=None):
def get_version():
"""
returns the default version.
"""
Expand Down
7 changes: 7 additions & 0 deletions navycut/__main__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
from .cli import print_version
import click


@click.command()
@click.option('-V', '--version', is_flag=True, callback=print_version,
expose_value=False, is_eager=True)
def _main():
from .cli import _execute_from_command_line
return _execute_from_command_line()
Expand Down
9 changes: 8 additions & 1 deletion navycut/cli/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import click as c
from ._exec_cli import _create_boiler_project
from navycut import get_version
from navycut import __version__

def print_version(ctx, param, value):
if not value or ctx.resilient_parsing:
return
c.echo(__version__)
ctx.exit()


@c.group()
def _execute_from_command_line():
Expand Down
2 changes: 1 addition & 1 deletion navycut/conf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import typing as t
from . import global_settings
from ..errors.server import SettingsFileNotFoundError, ImproperlyConfigured
from ..errors.misc import DataTypeMismatchError, NCBaseError
from ..errors.misc import DataTypeMismatchError

__all__ = ("get_settings_module", "settings")

Expand Down
4 changes: 2 additions & 2 deletions navycut/core/app_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def _attach_settings_modules(self):
self.settings = settings

self._add_config(settings)
self._configure_core_features()
self._configure_core_features(settings)
self._perform_sister_registration(settings)
self._perform_middleware_registration(settings)

Expand Down Expand Up @@ -144,7 +144,7 @@ def _add_extra_config(self, settings) -> None:
self.config[key] = value


def _configure_core_features(self):
def _configure_core_features(self, settings):
"""
add all the core features of navycut app here.
"""
Expand Down
2 changes: 1 addition & 1 deletion navycut/helpers/upload_server/sister.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@


class UploadServerSister(AppSister):
seize_power = True
seize_power = False
name = "upload_server_sister"
static_folder = settings.BASE_DIR / "uploads",
static_url_path = "/",
Expand Down

0 comments on commit dc11eed

Please sign in to comment.