diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5806e1cb3..ee89ded8d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ --- -default_stages: [commit, push] +default_stages: [pre-commit, pre-push] default_language_version: # force all unspecified python hooks to run python3 python: python3 @@ -28,7 +28,7 @@ repos: - --skip-glob - "**/migrations/*.py" - repo: https://github.com/sirosen/check-jsonschema - rev: 0.29.2 + rev: 0.29.3 hooks: - id: check-github-workflows - id: check-readthedocs @@ -39,7 +39,7 @@ repos: args: [-c, .yamllint.yml] # exclude: (feder/letters/logs/cassettes/.*|docker-compose.yml) - repo: https://github.com/psf/black - rev: 24.8.0 + rev: 24.10.0 hooks: - id: black args: diff --git a/docker-compose.yml b/docker-compose.yml index 00f1c71c9..e2f4bd4d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,8 @@ services: --max_allowed_packet=1024M ports: - "3306:3306" + networks: + - feder-app-network environment: MYSQL_ROOT_PASSWORD: "password" MYSQL_DATABASE: feder # feder_copy @@ -25,6 +27,8 @@ services: dockerfile: .contrib/docker/Dockerfile.gulp ports: - "35729:35729" + networks: + - feder-app-network volumes: - .:/app @@ -70,9 +74,11 @@ services: OPENAI_API_ENGINE_35_MAX_TOKENS: 16000 OPENAI_API_ENGINE_4_MAX_TOKENS: 100000 OPENAI_API_TEMPERATURE: 0.0 - OPENAI_API_VERSION: "2024-05-01-preview" + OPENAI_API_VERSION: "2024-09-01-preview" ports: - "8000:8000" + networks: + - feder-app-network # Following allows to execute `docker attach feder_web_1` # necessary when using ipdb in development: stdin_open: true @@ -98,6 +104,8 @@ services: ports: - "1080:1080" - "1025:1025" + networks: + - feder-app-network # # To use email reception uncomment below section and fill in your dev IMAP @@ -112,7 +120,14 @@ services: # COMPRESS_EML: "True" # env_file: # - secrets_imap-to-webhook-url.env + # networks: + # - feder-app-network volumes: mysql-data: maildump_data: + +networks: + feder-app-network: + driver: bridge + diff --git a/feder/__init__.py b/feder/__init__.py index 1f28c5e54..9f41dd35a 100644 --- a/feder/__init__.py +++ b/feder/__init__.py @@ -1,5 +1,5 @@ # PEP 396: The __version__ attribute's value SHOULD be a string. -__version__ = "1.5.21" +__version__ = "1.5.22" # Compatibility to eg. django-rest-framework diff --git a/feder/assets/scss/_milestones.scss b/feder/assets/scss/_milestones.scss index d04f5d4fb..f0334be03 100644 --- a/feder/assets/scss/_milestones.scss +++ b/feder/assets/scss/_milestones.scss @@ -13,7 +13,7 @@ $milestone-icon-width: $milestone-icon-padding * 2 + $milestone-icon-font-size + // the