Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar into oron_exercise

Author: orontamir

.gitignore

@@ -1,5 +1,6 @@
 dev.db
 test.db
+.idea
 config.py
 
 # Byte-compiled / optimized / DLL files
@@ -161,3 +162,7 @@ app/routers/stam
 .idea
 
 junit/
+
+# .DS_Store
+.DS_Store
+DS_Store

.pre-commit-config.yaml

@@ -1,19 +1,4 @@
 repos:
-  # Flake8 to check style is OK
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4
-    hooks:
-    - id: flake8
-  # yapf to fix many style mistakes
-  - repo: https://github.com/ambv/black
-    rev: 20.8b1
-    hooks:
-      - id: black
-        entry: black
-        language: python
-        language_version: python3
-        require_serial: true
-        types_or: [python, pyi]
   # More built in style checks and fixes
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v3.4.0
@@ -28,10 +13,37 @@ repos:
     - id: check-merge-conflict
     - id: end-of-file-fixer
     - id: sort-simple-yaml
+  - repo: https://github.com/pycqa/isort
+    rev: 5.7.0
+    hooks:
+      - id: isort
+        name: isort (python)
+        args: ["--profile", "black", "--line-length", "79"]
+      - id: isort
+        name: isort (cython)
+        types: [cython]
+      - id: isort
+        name: isort (pyi)
+        types: [pyi]
+  # Black: to fix many style mistakes
+  - repo: https://github.com/ambv/black
+    rev: 20.8b1
+    hooks:
+      - id: black
+        entry: black
+        language: python
+        language_version: python3
+        require_serial: true
+        types_or: [python, pyi]
   - repo: meta
     hooks:
     - id: check-useless-excludes
   - repo: https://github.com/asottile/add-trailing-comma
     rev: v2.1.0
     hooks:
     -   id: add-trailing-comma
+  # Flake8 to check style is OK
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.8.4
+    hooks:
+    - id: flake8

AUTHORS.md

@@ -33,6 +33,7 @@
          * PureDreamer - Developer
          * ShiZinDle - Developer
          * YairEn - Developer
+         * IdanPelled - Developer
 
 # Special thanks to
 

alembic.ini

@@ -0,0 +1,86 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+# script_location = alembic
+script_location = app\\database\\alembic
+
+# template used to generate migration files
+file_template = %%(year)d-%%(month).2d-%%(day).2d_%%(rev)s_%%(slug)s
+
+# timezone to use when rendering the date
+# within the migration file as well as the filename.
+# string value is passed to dateutil.tz.gettz()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the
+# "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; this defaults
+# to alembic/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path
+# version_locations = %(here)s/bar %(here)s/bat alembic/versions
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+# sqlalchemy.url = driver://user:pass@localhost/dbname
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks=black
+# black.type=console_scripts
+# black.entrypoint=black
+# black.options=-l 79
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

app/config.py.example

@@ -27,6 +27,10 @@ PSQL_ENVIRONMENT = False
 MEDIA_DIRECTORY = 'media'
 PICTURE_EXTENSION = '.png'
 AVATAR_SIZE = (120, 120)
+# For security reasons, set the upload path to a local absolute path.
+# Or for testing environment - just specify a folder name
+# that will be created under /app/
+UPLOAD_DIRECTORY = 'event_images'
 
 
 # DEFAULT WEBSITE LANGUAGE

app/database/alembic/README

@@ -0,0 +1,14 @@
+Generic single-database configuration.
+
+# following command will run all migration script and bring it to latest version
+alembic upgrade head
+
+# If we like to incrementally upgrade and check for some errors
+alembic upgrade +1
+
+# To undo last migration
+alembic downgrade -1
+
+# To get more information
+alembic current
+alembic history - verbose

git renamed to app/database/alembic/__init__.py

@@ -0,0 +1,81 @@
+import os
+from logging.config import fileConfig
+
+from alembic import context
+from sqlalchemy import create_engine
+
+from app import config as app_config
+from app.database.models import Base
+
+SQLALCHEMY_DATABASE_URL = os.getenv(
+    "DATABASE_CONNECTION_STRING",
+    app_config.DEVELOPMENT_DATABASE_STRING,
+)
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name, disable_existing_loggers=False)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+target_metadata = Base.metadata
+
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = SQLALCHEMY_DATABASE_URL
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+
+    connectable = create_engine(SQLALCHEMY_DATABASE_URL)
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=target_metadata,
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

app/database/alembic/env.py

@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}