Skip to content

Commit

Permalink
Merge pull request #12 from The-Galley:refactoring
Browse files Browse the repository at this point in the history
Fix env
  • Loading branch information
andy-takker authored May 13, 2024
2 parents fd66429 + 66aae54 commit 5dcc606
Show file tree
Hide file tree
Showing 6 changed files with 547 additions and 536 deletions.
6 changes: 6 additions & 0 deletions .env.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
POSTGRES_USER=pguser
POSTGRES_PASSWORD=pgpass
POSTGRES_DB=testdb

APP_SECRET=secret
APP_PRIVATE_KEY=
3 changes: 1 addition & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
default_language_version:
python: python3.12
python: python3.11

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand Down Expand Up @@ -35,7 +35,6 @@ repos:
name: mypy
entry: mypy ./industry_game --config-file ./pyproject.toml
language: python
language_version: python3.12
require_serial: true
pass_filenames: false

Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
PYTHON_VERSION = 3.11
PROJECT_PATH = ./industry_game/
TEST_PATH = ./tests/

Expand All @@ -15,7 +16,7 @@ clean_dev:
rm -rf .venv/

develop: clean_dev ##@Develop Create project venv
python3.12 -m venv .venv
python$(PYTHON_VERSION) -m venv .venv
.venv/bin/pip install -U pip poetry
.venv/bin/poetry config virtualenvs.create false
.venv/bin/poetry install
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ services:

APP_SECRET: $APP_SECRET
APP_PRIVATE_KEY: $APP_PRIVATE_KEY
APP_PUBLIC_KEY: $APP_PUBLIC_KEY

frontend:
restart: on-failure
# image: andytakker/industry-game-frontend:latest
build:
dockerfile: ./docker/frontend.dockerfile
context: .
Expand Down
Loading

0 comments on commit 5dcc606

Please sign in to comment.