Merge branch 'release/4.1.5'

Author: s3rius

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.7-alpine3.13
+FROM python:3.9.17-alpine
 
 RUN apk add --no-cache \
   curl \
@@ -11,7 +11,10 @@ RUN apk add --no-cache \
   # For psycopg \
   postgresql-dev \
   # For mysql deps \
-  mariadb-connector-c-dev
+  mariadb-connector-c-dev \
+  # For UI \
+  ncurses \
+  bash
 
 RUN adduser --disabled-password fastapi_template
 RUN mkdir /projects /src
@@ -32,6 +35,9 @@ RUN rm -rfv /src
 RUN apk del curl
 USER fastapi_template
 
+RUN git config --global user.name "Fastapi Template"
+RUN git config --global user.email "[email protected]"
+
 VOLUME /projects
 WORKDIR /projects
 

fastapi_template/template/{{cookiecutter.project_name}}/README.md

@@ -90,9 +90,9 @@ An example of .env file:
 You can read more about BaseSettings class here: https://pydantic-docs.helpmanual.io/usage/settings/
 
 {%- if cookiecutter.otlp_enabled == "True" %}
-## Opentelemetry 
+## OpenTelemetry 
 
-If you want to start your project with opentelemetry collector 
+If you want to start your project with OpenTelemetry collector 
 you can add `-f ./deploy/docker-compose.otlp.yml` to your docker command.
 
 Like this:
@@ -101,14 +101,14 @@ Like this:
 docker-compose -f deploy/docker-compose.yml -f deploy/docker-compose.otlp.yml --project-directory . up
 ```
 
-This command will start opentelemetry collector and jaeger. 
+This command will start OpenTelemetry collector and jaeger. 
 After sending a requests you can see traces in jaeger's UI
 at http://localhost:16686/.
 
 This docker configuration is not supposed to be used in production. 
 It's only for demo purpose.
 
-You can read more about opentelemetry here: https://opentelemetry.io/
+You can read more about OpenTelemetry here: https://opentelemetry.io/
 {%- endif %}
 
 ## Pre-commit
@@ -125,7 +125,7 @@ By default it runs:
 * black (formats your code);
 * mypy (validates types);
 * isort (sorts imports in all files);
-* flake8 (spots possibe bugs);
+* flake8 (spots possible bugs);
 
 
 You can read more about pre-commit here: https://pre-commit.com/

fastapi_template/template/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/tkq.py

@@ -21,13 +21,11 @@
 {%- if cookiecutter.enable_rmq == "True" %}
 broker = AioPikaBroker(
     str(settings.rabbit_url),
-    {%- if cookiecutter.enable_redis == "True" %}result_backend=result_backend, {%- endif %}
-)
+){%- if cookiecutter.enable_redis == "True" %}.with_result_backend(result_backend){%- endif %}
 {%- elif cookiecutter.enable_redis == "True" %}
 broker = ListQueueBroker(
     str(settings.redis_url.with_path("/1")),
-    result_backend=result_backend,
-)
+).with_result_backend(result_backend)
 {%- else %}
 broker = ZeroMQBroker()
 {%- endif %}

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastapi_template"
-version = "4.1.4"
+version = "4.1.5"
 description = "Feature-rich robust FastAPI template"
 authors = ["Pavel Kirilin <[email protected]>"]
 packages = [{ include = "fastapi_template" }]