Merge pull request #140 from TTWShell/bugfix/tpl

Bugfix/tpl

Author: TTWShell

.circleci/config.yml

@@ -43,13 +43,12 @@ jobs:
           command: |
             pip install flake8 pytest pytest-cov pytest-env
             pip install --editable ".[hobbit,hobbit_core]"
-            pip install celery
       - run:
           name: use flake8 check self
           command: flake8 .
       - run:
           name: run hobbit cmd
-          command: hobbit --echo startproject -n demo -d ~/haha -f -p 1024 --no-celery
+          command: hobbit --echo startproject -n demo -d ~/haha -f -p 1024
       - run:
           name: tree flask project
           command: |
@@ -75,17 +74,16 @@ jobs:
           command: |
             pip install flake8 pytest pytest-cov pytest-env
             pip install --editable ".[hobbit,hobbit_core]"
-            pip install celery
       - run:
           name: use flake8 check self
           command: flake8 .
       - run:
           name: run hobbit cmd
           command: |
             mkdir ~/haha && cd ~/haha
-            hobbit --echo startproject -n demo -f -p 1024 --celery
+            hobbit --echo startproject -n demo -f -p 1024
             mkdir ~/hahaha && cd ~/hahaha
-            hobbit --echo startproject -n demo -t rivendell -p 1025 --celery
+            hobbit --echo startproject -n demo -t rivendell -p 1025
       - run:
           name: tree flask project
           command: |

Pipfile.lock

@@ -213,6 +213,7 @@
 from hobbit_core import HobbitManager  # noqa
 
 app = Flask('', root_path='.')
+app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory"
 db = SQLAlchemy()
 db.init_app(app)
 hobbit = HobbitManager()

docs/conf.py

@@ -36,10 +36,8 @@ def common_options(func):
 @click.option('-p', '--port', help='Port of web server.', required=True,
               type=click.IntRange(1024, 65535))
 @common_options
-@click.option('--celery/--no-celery', default=False,
-              help='Generate celery files or not.')
 @click.pass_context
-def new(ctx, name, port, dist, template, force, celery):
+def new(ctx, name, port, dist, template, force):
     """Create a new flask project, render from different template.
 
     Examples::
@@ -52,14 +50,12 @@ def new(ctx, name, port, dist, template, force, celery):
     """  # noqa
     dist = os.getcwd() if dist is None else os.path.abspath(dist)
     ctx.obj['FORCE'] = force
-    ctx.obj['CELERY'] = celery
     ctx.obj['JINJIA_CONTEXT'] = {
         'project_name': name,
         'port': port,
         'secret_key': ''.join(random.choice(
             string.ascii_letters) for i in range(38)),
         'version': pkg_resources.get_distribution("hobbit-core").version,
-        'celery': celery,
     }
 
     echo(f'Start init a hobbit project `{name}` to `{dist}`,'

hobbit/bootstrap.py

@@ -29,7 +29,6 @@ def chdir(dist):
 
 @click.pass_context
 def render_project(ctx, dist, tpl_path):
-    celery = ctx.obj.get('CELERY')  # gen cmd not have this arg
     context = ctx.obj['JINJIA_CONTEXT']
 
     jinjia_env = Environment(loader=FileSystemLoader(tpl_path))
@@ -48,9 +47,6 @@ def render_project(ctx, dist, tpl_path):
                 render_file(dist, fn[:-len(SUFFIX)], data)
                 continue
 
-            if not celery and origin_path.endswith('tasks'):
-                continue
-
             dir_name = Template(fn).render(context)
             render_project(os.path.join(dist, dir_name),
                            os.path.join(tpl_path, fn))

hobbit/handlers/bootstrap.py

@@ -7,8 +7,4 @@ SECRET_KEY = '{{ secret_key }}'
 SQLALCHEMY_DATABASE_URI = 'sqlite:///{}'.format(
     os.path.join(ROOT_PATH, '{{ project_name }}.db'))
 SQLALCHEMY_TRACK_MODIFICATIONS = False
-{% if celery %}
-CELERY_TIMEZONE = 'Asia/Shanghai'
-BROKER_URL = 'sqla+sqlite:///celerydb.sqlite'  # CELERY_BROKER_URL
-CELERY_RESULT_BACKEND = 'db+sqlite:///results.sqlite'
-{% endif %}
+

hobbit/static/bootstrap/rivendell/app/configs/default.py.jinja2

@@ -1,17 +1,11 @@
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
 from flask_marshmallow import Marshmallow
-{%- if celery %}
-from celery import Celery
-{%- endif %}
 
 from hobbit_core import HobbitManager
 
 db = SQLAlchemy()
 migrate = Migrate()
 ma = Marshmallow()
-{%- if celery %}
-celery = Celery()
-{%- endif %}
 hobbit = HobbitManager()
 

hobbit/static/bootstrap/rivendell/app/exts.py.jinja2

@@ -6,7 +6,7 @@ from flask.helpers import get_env
 
 from hobbit_core.err_handler import ErrHandler
 
-from app.exts import db, migrate, ma, hobbit{% if celery %}, celery{% endif %}
+from app.exts import db, migrate, ma, hobbit
 
 
 def register_extensions(app):
@@ -33,21 +33,6 @@ def register_cmds(app):
     pass
 
 
-{% if celery -%}
-def make_celery(app):
-    celery.conf.update(app.config)
-
-    class ContextTask(celery.Task):
-        def __call__(self, *args, **kwargs):
-            with app.app_context():
-                return self.run(*args, **kwargs)
-
-    celery.Task = ContextTask
-    from app import tasks  # NOQA
-    return celery
-
-
-{% endif -%}
 def create_app():
     app = Flask(__name__, instance_relative_config=True)
     app.config.from_object('app.configs.{}'.format(get_env()))
@@ -57,9 +42,6 @@ def create_app():
         register_blueprints(app)
     register_error_handler(app)
     register_cmds(app)
-    {%- if celery %}
-    make_celery(app)
-    {%- endif %}
 
     @app.before_request
     def log_request_info():

hobbit/static/bootstrap/rivendell/app/run.py.jinja2

@@ -1,4 +1 @@
-hobbit-core[hobbit,hobbit_core]=={{ version }}
-{% if celery -%}
-celery
-{% endif %}
+hobbit-core[hobbit,hobbit_core]=={{ version }}

hobbit/static/bootstrap/rivendell/app/tasks/__init__.py.jinja2

@@ -18,19 +18,4 @@ def app(request):
 @pytest.fixture(scope='session')
 def client(app, request):
     return app.test_client()
-{% if celery %}
 
-@pytest.fixture(scope='session')
-def celery_config(app):
-    return {
-        'broker_url': 'sqla+sqlite:///.test/celerydb.sqlite',
-        'result_backend': 'db+sqlite:///.test/celeryresults.sqlite'
-    }
-
-
-@pytest.fixture(scope='session')
-def celery_app(app):
-    from app.run import celery
-    from celery.contrib.testing import tasks  # NOQA
-    return celery
-{% endif %}

hobbit/static/bootstrap/rivendell/requirements.txt.jinja2

@@ -5,12 +5,12 @@ class TestAPIExample(BaseTest):
 
     def test_ping_api(self, client):
         resp = client.get('/api/ping')
-        assert resp.status == 200
+        assert resp.status_code == 200
 
 
 class TestOption(BaseTest):
 
     def test_options(self, client):
         resp = client.get('/api/options')
-        assert resp.status == 200
+        assert resp.status_code == 200
 

hobbit/static/bootstrap/rivendell/tests/conftest.py.jinja2

@@ -7,8 +7,4 @@ SECRET_KEY = '{{ secret_key }}'
 SQLALCHEMY_DATABASE_URI = 'sqlite:///{}'.format(
     os.path.join(ROOT_PATH, '{{ project_name }}.db'))
 SQLALCHEMY_TRACK_MODIFICATIONS = False
-{% if celery %}
-CELERY_TIMEZONE = 'Asia/Shanghai'
-BROKER_URL = 'sqla+sqlite:///celerydb.sqlite'  # CELERY_BROKER_URL
-CELERY_RESULT_BACKEND = 'db+sqlite:///results.sqlite'
-{% endif %}
+

hobbit/static/bootstrap/rivendell/tests/test_tools.py.jinja2

@@ -1,17 +1,11 @@
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
 from flask_marshmallow import Marshmallow
-{%- if celery %}
-from celery import Celery
-{%- endif %}
 
 from hobbit_core import HobbitManager
 
 db = SQLAlchemy()
 migrate = Migrate()
 ma = Marshmallow()
-{%- if celery %}
-celery = Celery()
-{%- endif %}
 hobbit = HobbitManager()
 

hobbit/static/bootstrap/shire/app/configs/default.py.jinja2

@@ -6,7 +6,7 @@ from flask.helpers import get_env
 
 from hobbit_core.err_handler import ErrHandler
 
-from app.exts import db, migrate, ma, hobbit{% if celery %}, celery{% endif %}
+from app.exts import db, migrate, ma, hobbit
 
 
 def register_extensions(app):
@@ -33,21 +33,6 @@ def register_cmds(app):
     pass
 
 
-{% if celery -%}
-def make_celery(app):
-    celery.conf.update(app.config)
-
-    class ContextTask(celery.Task):
-        def __call__(self, *args, **kwargs):
-            with app.app_context():
-                return self.run(*args, **kwargs)
-
-    celery.Task = ContextTask
-    from app import tasks  # NOQA
-    return celery
-
-
-{% endif -%}
 def create_app():
     app = Flask(__name__, instance_relative_config=True)
     app.config.from_object('app.configs.{}'.format(get_env()))
@@ -57,9 +42,6 @@ def create_app():
         register_blueprints(app)
     register_error_handler(app)
     register_cmds(app)
-    {%- if celery %}
-    make_celery(app)
-    {%- endif %}
 
     @app.before_request
     def log_request_info():

hobbit/static/bootstrap/shire/app/exts.py.jinja2

@@ -1,4 +1 @@
-hobbit-core[hobbit,hobbit_core]=={{ version }}
-{% if celery -%}
-celery
-{% endif %}
+hobbit-core[hobbit,hobbit_core]=={{ version }}

hobbit/static/bootstrap/shire/app/run.py.jinja2

@@ -18,19 +18,4 @@ def app(request):
 @pytest.fixture(scope='session')
 def client(app, request):
     return app.test_client()
-{% if celery %}
 
-@pytest.fixture(scope='session')
-def celery_config(app):
-    return {
-        'broker_url': 'sqla+sqlite:///.test/celerydb.sqlite',
-        'result_backend': 'db+sqlite:///.test/celeryresults.sqlite'
-    }
-
-
-@pytest.fixture(scope='session')
-def celery_app(app):
-    from app.run import celery
-    from celery.contrib.testing import tasks  # NOQA
-    return celery
-{% endif %}

hobbit/static/bootstrap/shire/app/tasks/__init__.py.jinja2

@@ -5,12 +5,12 @@ class TestAPIExample(BaseTest):
 
     def test_ping_api(self, client):
         resp = client.get('/api/ping')
-        assert resp.status == 200
+        assert resp.status_code == 200
 
 
 class TestOption(BaseTest):
 
     def test_options(self, client):
         resp = client.get('/api/options')
-        assert resp.status == 200
+        assert resp.status_code == 200
 

hobbit/static/bootstrap/shire/requirements.txt.jinja2

@@ -16,7 +16,7 @@ def gen_data(data_root='static'):
 
 package_data = gen_data()
 # The amount files of `shire[new]` + `rivendell[new]`
-assert len(package_data) == 28 + 29, \
+assert len(package_data) == 27 + 28, \
     'nums of tepl files error, {}'.format(len(package_data))
 package_data.append('py.typed')
 
@@ -32,7 +32,7 @@ def gen_data(data_root='static'):
 
 setup(
     name='hobbit-core',
-    version='3.0.0.rc1',
+    version='3.0.0.rc2',
     python_requires='>=3.7, <4',
     description='Hobbit - A flask project generator.',
     long_description=long_description,

hobbit/static/bootstrap/shire/tests/conftest.py.jinja2

@@ -33,14 +33,14 @@ def test_not_exist_cmd(self, runner):
         assert 'Error: cmd not exist: doesnotexistcmd' in result.output
 
     @pytest.mark.parametrize(
-        'name,template,celery_,dist',
+        'name,template,dist',
         itertools.product(
-            ['haha'], templates, ['--celery', '--no-celery'],
+            ['haha'], templates,
             [None, '.', wkdir]))
     @chdir(wkdir)
-    def test_new_cmd(self, runner, name, template, celery_, dist):
+    def test_new_cmd(self, runner, name, template, dist):
         options = [
-            '--echo', 'new', '-p 1024', '-n', name,  '-t', template, celery_]
+            '--echo', 'new', '-p 1024', '-n', name,  '-t', template]
         if dist:
             assert os.getcwd() == os.path.abspath(dist)
             options.extend(['-d', dist])
@@ -52,14 +52,10 @@ def test_new_cmd(self, runner, name, template, celery_, dist):
 
         file_nums = {
             # tart + 29 files + 11 dir + 1 end + empty
-            'shire | --no-celery':  1 + 27 + 11 + 1 + 1 - 1,
-            # start + files + mkdir + tail
-            'shire | --celery': 1 + 28 + 12 + 1,
-            'rivendell | --no-celery':  1 + 29 + 11 + 1,
-            'rivendell | --celery':  1 + 30 + 12 + 1,
+            'shire':  1 + 27 + 11 + 1 + 1 - 1,
+            'rivendell':  1 + 29 + 11 + 1,
         }
-        assert len(result.output.split('\n')) == file_nums[
-            f'{template} | {celery_}']
+        assert len(result.output.split('\n')) == file_nums[f'{template}']
 
         assert subprocess.call(['flake8', '.']) == 0
         assert subprocess.call(