From 294f562fb918b49fd950a7e810e445d17f5206d9 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 7 Feb 2024 18:30:35 +0530 Subject: [PATCH] build: Pin frappe requirements to ^16.0.0 (#39782) --- erpnext/hooks.py | 1 - erpnext/setup/install.py | 21 --------------------- pyproject.toml | 3 +++ 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 14b7656491..308e6ca011 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -42,7 +42,6 @@ setup_wizard_test = "erpnext.setup.setup_wizard.test_setup_wizard.run_setup_wiza before_install = [ "erpnext.setup.install.check_setup_wizard_not_completed", - "erpnext.setup.install.check_frappe_version", ] after_install = "erpnext.setup.install.after_install" diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index 6239864c23..527f742841 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -2,14 +2,12 @@ # License: GNU General Public License v3. See license.txt -import click import frappe from frappe import _ from frappe.custom.doctype.custom_field.custom_field import create_custom_fields from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to from frappe.utils import cint -import erpnext from erpnext.setup.default_energy_point_rules import get_default_energy_point_rules from erpnext.setup.doctype.incoterm.incoterm import create_incoterms @@ -42,25 +40,6 @@ You can reinstall this site (after saving your data) using: bench --site [sitena frappe.throw(message) # nosemgrep -def check_frappe_version(): - def major_version(v: str) -> str: - return v.split(".")[0] - - frappe_version = major_version(frappe.__version__) - erpnext_version = major_version(erpnext.__version__) - - if frappe_version == erpnext_version: - return - - click.secho( - f"You're attempting to install ERPNext version {erpnext_version} with Frappe version {frappe_version}. " - "This is not supported and will result in broken install. Switch to correct branch before installing.", - fg="red", - ) - - raise SystemExit(1) - - def set_single_defaults(): for dt in ( "Accounts Settings", diff --git a/pyproject.toml b/pyproject.toml index 604aa44585..8a0f12c5f5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,3 +39,6 @@ force_grid_wrap = 0 use_parentheses = true ensure_newline_before_comments = true indent = "\t" + +[tool.bench.frappe-dependencies] +frappe = ">=16.0.0-dev,<17.0.0"