diff --git a/config-example.json b/config-example.json index 5a9ddebf6d02d12a1f3d9e7036d22ea85fc98ba3..d168df4432176fb9345e45ad429ee896f7088665 100644 --- a/config-example.json +++ b/config-example.json @@ -1,3 +1,3 @@ { - "SQLALCHEMY_DATABASE_URI": "postgresql://compendium_v2:password@localhost/compendium_v2" + "SQLALCHEMY_DATABASE_URI": "mysql+pymysql://compendium:compendium321@localhost/compendium" } diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000000000000000000000000000000000..de0a388ae2e432a1981ebec624a3bfedef4a6d04 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,17 @@ +services: + mysql: + restart: unless-stopped + container_name: mysql-compendium + environment: + MYSQL_ALLOW_EMPTY_PASSWORD: "no" + MYSQL_DATABASE: compendium + MYSQL_PASSWORD: compendium321 + MYSQL_ROOT_PASSWORD: compendium321 + MYSQL_USER: compendium + volumes: + - ./build/mysql_logs:/var/log/ + - ./build/mysql_data:/var/lib/mysql/ + image: mysql:8 + command: mysqld --general-log=1 --general-log-file=/var/log/mysql.log + ports: + - 3306:3306 diff --git a/requirements.txt b/requirements.txt index ddfa46ce768aab282886a108bf5ee84bee88ef45..378dff7a389ac5c9310e94656bc3e53a4dd49da3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,12 +2,12 @@ alembic jsonschema flask flask-cors -flask-SQLAlchemy -flask-Migrate -psycopg2-binary +PyMySQL +cryptography SQLAlchemy pytest pytest-mock +python-dotenv sphinx sphinx-rtd-theme @@ -18,5 +18,4 @@ types-docutils types-jsonschema types-Flask-Cors types-setuptools -types-sqlalchemy -types-flask_migrate \ No newline at end of file +types-sqlalchemy \ No newline at end of file diff --git a/setup.py b/setup.py index 3637236a0cd26486ba33856bc385fe533093e845..d8ca4882dce5fd19d9f6a6bd26de6b5d42a9f98c 100644 --- a/setup.py +++ b/setup.py @@ -13,11 +13,10 @@ setup( 'jsonschema', 'flask', 'flask-cors', - 'flask', - 'Flask-Migrate', - 'psycopg2-binary', 'SQLAlchemy', - 'Flask-SQLAlchemy' + 'alembic', + 'PyMySQL', + 'cryptography', ], include_package_data=True, )