From ff532e14d2a71a21b20c240c999d223e15d6794f Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 14 Feb 2024 12:21:56 +0000 Subject: [PATCH 01/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 0566760f..c5949835 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.13.0 +ERPNEXT_VERSION=v15.14.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a2c1c858..9833f34c 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.13.0 + image: frappe/erpnext:v15.14.0 deploy: restart_policy: condition: on-failure From 7fee2dc8f369aaaf78a0258227649b55a17fc5d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 10:50:49 +0530 Subject: [PATCH 02/28] chore(deps): Update pre-commit hooks (#1334) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 41d81fdb..72ee627c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: args: [--py37-plus] - repo: https://github.com/psf/black - rev: 24.1.1 + rev: 24.2.0 hooks: - id: black From 53c6a0e0c6778c018e7d76081750d75a4a923a4e Mon Sep 17 00:00:00 2001 From: Kevin Wakhisi Maraka Date: Fri, 16 Feb 2024 09:53:01 +0300 Subject: [PATCH 03/28] chore! :alien: Enhance dev container YAML (#1332) * chore!i :alien: Enhance dev container YAML Enhance dev container YAML to meet standards and integrate personal GitHub environment token Refactored the existing dev container YAML configuration to adhere to best practices and coding standards. This includes optimizing container setup and dependencies for smoother development workflows. Additionally, integrated a personal GitHub environment token for secure authentication and access to GitHub resources within the container environment. This improvement enhances both security and usability, streamlining the development process. * chore :lipstick: Fixed earlier commit Earlier commit fixed using pre-commit --- devcontainer-example/devcontainer.json | 38 ++++++++++++++++---------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/devcontainer-example/devcontainer.json b/devcontainer-example/devcontainer.json index d80b845d..dd918069 100644 --- a/devcontainer-example/devcontainer.json +++ b/devcontainer-example/devcontainer.json @@ -2,24 +2,32 @@ "name": "Frappe Bench", "forwardPorts": [8000, 9000, 6787], "remoteUser": "frappe", - "settings": { - "terminal.integrated.profiles.linux": { - "frappe bash": { - "path": "/bin/bash", - }, - }, - "terminal.integrated.defaultProfile.linux": "frappe bash", - "debug.node.autoAttach": "disabled", + "customizations": { + "vscode": { + "extensions": [ + "ms-python.python", + "ms-vscode.live-server", + "grapecity.gc-excelviewer", + "mtxr.sqltools", + "visualstudioexptteam.vscodeintellicode" + ], + "settings": { + "terminal.integrated.profiles.linux": { + "frappe bash": { + "path": "/bin/bash" + } + }, + "terminal.integrated.defaultProfile.linux": "frappe bash", + "debug.node.autoAttach": "disabled" + } + } }, "dockerComposeFile": "./docker-compose.yml", "service": "frappe", "workspaceFolder": "/workspace/development", "shutdownAction": "stopCompose", - "extensions": [ - "ms-python.python", - "ms-vscode.live-server", - "grapecity.gc-excelviewer", - "mtxr.sqltools", - "visualstudioexptteam.vscodeintellicode", - ], + "postStartCommand": "sudo service ssh start", + "mounts": [ + "source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/home/frappe/.ssh,type=bind,consistency=cached" + ] } From 8961598d1ea7259036e6892cfa3e9a6acff40c71 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 16 Feb 2024 10:38:23 +0000 Subject: [PATCH 04/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index c5949835..2e68f6c8 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.14.0 +ERPNEXT_VERSION=v15.14.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 9833f34c..13af36c8 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.0 + image: frappe/erpnext:v15.14.1 deploy: restart_policy: condition: on-failure From d027f04494588d9f3e3e9a96549bea69cad2b5c2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 16 Feb 2024 16:29:20 +0000 Subject: [PATCH 05/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 2e68f6c8..12b34f57 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.14.1 +ERPNEXT_VERSION=v15.14.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 13af36c8..0aad32e2 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.1 + image: frappe/erpnext:v15.14.2 deploy: restart_policy: condition: on-failure From f60dc886375858499da664a639d1b75378c65112 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 19 Feb 2024 05:42:49 +0000 Subject: [PATCH 06/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 12b34f57..a16cbf64 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.14.2 +ERPNEXT_VERSION=v15.14.3 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 0aad32e2..6044b784 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.2 + image: frappe/erpnext:v15.14.3 deploy: restart_policy: condition: on-failure From edb9948fc932ec10ad06c42bb846e7c01e581476 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 18:31:06 +0530 Subject: [PATCH 07/28] chore(deps): Update pre-commit hooks (#1338) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 72ee627c..3fcd5dc9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: end-of-file-fixer - repo: https://github.com/asottile/pyupgrade - rev: v3.15.0 + rev: v3.15.1 hooks: - id: pyupgrade args: [--py37-plus] From 2c317cb62da88d2fbd2c91f24de8f11083a7a94a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 18:31:25 +0530 Subject: [PATCH 08/28] chore(deps): bump pytest from 8.0.0 to 8.0.1 (#1339) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.0 to 8.0.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.0.0...8.0.1) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index 8075a1ec..61195c7d 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.0.0 +pytest==8.0.1 From 3360d23e55a9cb7aa6c0d402cbf4e30b334e68cd Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 21 Feb 2024 05:38:43 +0000 Subject: [PATCH 09/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index a16cbf64..d5405f20 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.14.3 +ERPNEXT_VERSION=v15.14.4 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 6044b784..a2449b13 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.3 + image: frappe/erpnext:v15.14.4 deploy: restart_policy: condition: on-failure From d028de489891b68bde7044f8915809f7fb9f7a4e Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 22 Feb 2024 05:47:42 +0000 Subject: [PATCH 10/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index d5405f20..c3b7fda9 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.14.4 +ERPNEXT_VERSION=v15.14.5 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index a2449b13..23cbde99 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.4 + image: frappe/erpnext:v15.14.5 deploy: restart_policy: condition: on-failure From 3bc28d38b288cd49b3e002590af4da9007025ab7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 22 Feb 2024 11:27:44 +0000 Subject: [PATCH 11/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index c3b7fda9..a5584142 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.14.5 +ERPNEXT_VERSION=v15.14.6 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 23cbde99..630f107b 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.5 + image: frappe/erpnext:v15.14.6 deploy: restart_policy: condition: on-failure From 4c0aba6b0c8f6aad6d9b176547da7de3a55d50bb Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 26 Feb 2024 07:42:07 +0000 Subject: [PATCH 12/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index a5584142..940728f6 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.14.6 +ERPNEXT_VERSION=v15.14.7 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 630f107b..22f0bfcf 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.6 + image: frappe/erpnext:v15.14.7 deploy: restart_policy: condition: on-failure From ab0d6ad9e5833f249599e6aafeef6d38244e5362 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 02:41:20 +0530 Subject: [PATCH 13/28] chore(deps): bump pytest from 8.0.1 to 8.0.2 (#1341) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.1 to 8.0.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.0.1...8.0.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index 61195c7d..a9882e0c 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.0.1 +pytest==8.0.2 From 33cbdb2693e8021fd8fd369b92aee013a92166ae Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 28 Feb 2024 05:22:17 +0000 Subject: [PATCH 14/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 940728f6..359f5703 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.14.7 +ERPNEXT_VERSION=v15.15.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 22f0bfcf..6490fa53 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.14.7 + image: frappe/erpnext:v15.15.0 deploy: restart_policy: condition: on-failure From e582a2448d7c69f410231e55f9e5ef2b9585ae95 Mon Sep 17 00:00:00 2001 From: HENRY Florian Date: Thu, 29 Feb 2024 13:15:56 +0100 Subject: [PATCH 15/28] fix: add file cmd because restore bench need it since frappe commit: 50d21677b872ff89d2912c7b57467757a35f549a (#1343) --- images/bench/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile index 291e4256..ec7078e2 100644 --- a/images/bench/Dockerfile +++ b/images/bench/Dockerfile @@ -69,6 +69,7 @@ RUN apt-get update \ xz-utils \ tk-dev \ liblzma-dev \ + file \ && rm -rf /var/lib/apt/lists/* RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ From 955a3b0b6543c9d7ac2b4731834f576870262194 Mon Sep 17 00:00:00 2001 From: John Haugabook Date: Thu, 29 Feb 2024 07:16:18 -0500 Subject: [PATCH 16/28] fix: grammar and links (#1342) Made grammar corrections, and added links to the prerequisite installations. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 436e3f4a..43816c84 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Everything about [Frappe](https://github.com/frappe/frappe) and [ERPNext](https: # Getting Started -To get started, you need Docker, docker-compose and git setup on your machine. For Docker basics and best practices. Refer Docker [documentation](http://docs.docker.com). +To get started you need [Docker](https://docs.docker.com/get-docker/), [docker-compose](https://docs.docker.com/compose/), and [git](https://docs.github.com/en/get-started/getting-started-with-git/set-up-git) setup on your machine. For Docker basics and best practices refer to Docker's [documentation](http://docs.docker.com). After that, clone this repo: ```sh From ede911af0aa5b720ba6a5b673f5a51efb0f3a90b Mon Sep 17 00:00:00 2001 From: Malay Gondalia <134581231+malay-gondalia@users.noreply.github.com> Date: Thu, 29 Feb 2024 20:59:32 +0530 Subject: [PATCH 17/28] Update custom-apps.md (#1344) * Update custom-apps.md made document clear to insert custom app to build and resolved error - "url": "https://user:password@git.example.com/project/repository.git", to "url": "https://{{ PAT }}@git.example.com/project/repository.git", * docs: remove comments from shell commands --------- Co-authored-by: Revant Nandgaonkar --- docs/custom-apps.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/custom-apps.md b/docs/custom-apps.md index c2cb6f85..9d31c6bb 100644 --- a/docs/custom-apps.md +++ b/docs/custom-apps.md @@ -20,10 +20,11 @@ export APPS_JSON='[ "branch": "version-15" }, { - "url": "https://user:password@git.example.com/project/repository.git", + "url": "https://{{ PAT }}@git.example.com/project/repository.git", "branch": "main" } ]' + export APPS_JSON_BASE64=$(echo ${APPS_JSON} | base64 -w 0) ``` @@ -35,7 +36,7 @@ export APPS_JSON_BASE64=$(base64 -w 0 /path/to/apps.json) Note: -- `url` needs to be http(s) git url with token/auth in case of private repo. +- `url` needs to be http(s) git url with personal access tokens without username eg:- http://{{PAT}}@github.com/project/repository.git in case of private repo. - add dependencies manually in `apps.json` e.g. add `payments` if you are installing `erpnext` - use fork repo or branch for ERPNext in case you need to use your fork or test a PR. From 997473863ee7b17e86acb175099708cf886aedd4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:11:59 +0530 Subject: [PATCH 18/28] chore(deps): bump pytest from 8.0.2 to 8.1.0 (#1347) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.2 to 8.1.0. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.0.2...8.1.0) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index a9882e0c..81cf8a95 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.0.2 +pytest==8.1.0 From 1eafdcdc8555bb84083ed7176bf4c0f70892d29a Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 6 Mar 2024 03:40:05 +0000 Subject: [PATCH 19/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 359f5703..96a5f9a5 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.15.0 +ERPNEXT_VERSION=v15.16.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 6490fa53..f9693c9b 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.15.0 + image: frappe/erpnext:v15.16.0 deploy: restart_policy: condition: on-failure From 82c65ec147902df4d430509ad98a44ef8e2be329 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 6 Mar 2024 14:57:10 +0000 Subject: [PATCH 20/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 96a5f9a5..31929465 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.16.0 +ERPNEXT_VERSION=v15.16.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index f9693c9b..065d6d68 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.16.0 + image: frappe/erpnext:v15.16.1 deploy: restart_policy: condition: on-failure From 76976c30e1983cf97a0250e147323a37add95810 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 7 Mar 2024 09:33:50 +0000 Subject: [PATCH 21/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 31929465..99b41c04 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.16.1 +ERPNEXT_VERSION=v15.16.2 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 065d6d68..13bace25 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.16.1 + image: frappe/erpnext:v15.16.2 deploy: restart_policy: condition: on-failure From 636c442fdbcec7e0c064da392579f8f81033fe64 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Sun, 10 Mar 2024 05:38:16 +0530 Subject: [PATCH 22/28] fix(dev): remove ssh from post start command (#1349) no ssh service installed in frappe/bench:latest for custom usage add to gitignored .devcontainer --- devcontainer-example/devcontainer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/devcontainer-example/devcontainer.json b/devcontainer-example/devcontainer.json index dd918069..2e60f65d 100644 --- a/devcontainer-example/devcontainer.json +++ b/devcontainer-example/devcontainer.json @@ -26,7 +26,6 @@ "service": "frappe", "workspaceFolder": "/workspace/development", "shutdownAction": "stopCompose", - "postStartCommand": "sudo service ssh start", "mounts": [ "source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh,target=/home/frappe/.ssh,type=bind,consistency=cached" ] From a33ec8460fc07e8c4b4c0284fe88b870e18be4c6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 13 Mar 2024 04:37:40 +0000 Subject: [PATCH 23/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index 99b41c04..a983f406 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.16.2 +ERPNEXT_VERSION=v15.17.0 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 13bace25..0a1bb498 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.16.2 + image: frappe/erpnext:v15.17.0 deploy: restart_policy: condition: on-failure From f7c497e240d4ecd0fa448585d5f3a0ae810c5977 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 14 Mar 2024 09:25:53 +0000 Subject: [PATCH 24/28] chore: Update example.env --- example.env | 2 +- pwd.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example.env b/example.env index a983f406..1495dec7 100644 --- a/example.env +++ b/example.env @@ -1,6 +1,6 @@ # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/images-and-compose-files.md -ERPNEXT_VERSION=v15.17.0 +ERPNEXT_VERSION=v15.17.1 DB_PASSWORD=123 diff --git a/pwd.yml b/pwd.yml index 0a1bb498..2b330ece 100644 --- a/pwd.yml +++ b/pwd.yml @@ -2,7 +2,7 @@ version: "3" services: backend: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: on-failure @@ -11,7 +11,7 @@ services: - logs:/home/frappe/frappe-bench/logs configurator: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: none @@ -39,7 +39,7 @@ services: - logs:/home/frappe/frappe-bench/logs create-site: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: none @@ -89,7 +89,7 @@ services: - db-data:/var/lib/mysql frontend: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 depends_on: - websocket deploy: @@ -113,7 +113,7 @@ services: - "8080:8080" queue-long: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: on-failure @@ -127,7 +127,7 @@ services: - logs:/home/frappe/frappe-bench/logs queue-short: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: on-failure @@ -157,7 +157,7 @@ services: - redis-cache-data:/data scheduler: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: on-failure @@ -169,7 +169,7 @@ services: - logs:/home/frappe/frappe-bench/logs websocket: - image: frappe/erpnext:v15.17.0 + image: frappe/erpnext:v15.17.1 deploy: restart_policy: condition: on-failure From a8d7a70b269e2d8b1795c5d13cdd61439fffa045 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Mar 2024 11:08:57 +0530 Subject: [PATCH 25/28] chore(deps): bump pytest from 8.1.0 to 8.1.1 (#1350) Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.0 to 8.1.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.1.0...8.1.1) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-test.txt b/requirements-test.txt index 81cf8a95..2f6c9d20 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1 +1 @@ -pytest==8.1.0 +pytest==8.1.1 From cf35c277ab87430aa3eae0f6cc247cc96d2dac33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Mar 2024 11:09:12 +0530 Subject: [PATCH 26/28] chore(deps): bump docker/bake-action from 4.1.0 to 4.3.0 (#1354) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 4.1.0 to 4.3.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](https://github.com/docker/bake-action/compare/v4.1.0...v4.3.0) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_bench.yml | 4 ++-- .github/workflows/docker-build-push.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_bench.yml b/.github/workflows/build_bench.yml index 26003f28..2d8c1e16 100644 --- a/.github/workflows/build_bench.yml +++ b/.github/workflows/build_bench.yml @@ -38,7 +38,7 @@ jobs: run: echo "LATEST_BENCH_RELEASE=$(curl -s 'https://api.github.com/repos/frappe/bench/releases/latest' | jq -r '.tag_name')" >> "$GITHUB_ENV" - name: Build and test - uses: docker/bake-action@v4.1.0 + uses: docker/bake-action@v4.3.0 with: targets: bench-test @@ -51,7 +51,7 @@ jobs: - name: Push if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }} - uses: docker/bake-action@v4.1.0 + uses: docker/bake-action@v4.3.0 with: targets: bench push: true diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index b519ec9a..46a0b012 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -56,7 +56,7 @@ jobs: echo "NODE_VERSION=${{ inputs.node_version }}" >> "$GITHUB_ENV" - name: Build - uses: docker/bake-action@v4.1.0 + uses: docker/bake-action@v4.3.0 with: push: true env: @@ -84,6 +84,6 @@ jobs: - name: Push if: ${{ inputs.push }} - uses: docker/bake-action@v4.1.0 + uses: docker/bake-action@v4.3.0 with: push: true From a7d3ec1816aab92ce07273841af4ee30a94c5e65 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 17 Mar 2024 11:09:34 +0530 Subject: [PATCH 27/28] chore(deps): Update pre-commit hooks (#1355) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3fcd5dc9..ecde0607 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: args: [--py37-plus] - repo: https://github.com/psf/black - rev: 24.2.0 + rev: 24.3.0 hooks: - id: black From feb16790992fcabf53bb55288e030c79fa2246ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:54:17 +0530 Subject: [PATCH 28/28] chore(deps): Update pre-commit hooks (#1356) Co-authored-by: vrslev <75225148+vrslev@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ecde0607..c6a37f02 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -47,7 +47,7 @@ repos: types: [shell] - repo: https://github.com/shellcheck-py/shellcheck-py - rev: v0.9.0.6 + rev: v0.10.0.1 hooks: - id: shellcheck args: [-x]