Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Pin frappe requirements to ^16.0.0 (#39782)

Browse Source
This commit is contained in:
Ankush Menat 2024-02-07 18:30:35 +05:30 committed by GitHub
parent 81e82b0595
commit 294f562fb9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/hooks.py
View File

@ -42,7 +42,6 @@ setup_wizard_test = "erpnext.setup.setup_wizard.test_setup_wizard.run_setup_wiza
before_install = [ before_install = [
"erpnext.setup.install.check_setup_wizard_not_completed", "erpnext.setup.install.check_setup_wizard_not_completed",
"erpnext.setup.install.check_frappe_version",
] ]
after_install = "erpnext.setup.install.after_install" after_install = "erpnext.setup.install.after_install"

21
erpnext/setup/install.py
View File

@ -2,14 +2,12 @@
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
import click
import frappe import frappe
from frappe import _ from frappe import _
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields 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.desk.page.setup_wizard.setup_wizard import add_all_roles_to
from frappe.utils import cint from frappe.utils import cint
import erpnext
from erpnext.setup.default_energy_point_rules import get_default_energy_point_rules from erpnext.setup.default_energy_point_rules import get_default_energy_point_rules
from erpnext.setup.doctype.incoterm.incoterm import create_incoterms 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 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(): def set_single_defaults():
for dt in ( for dt in (
"Accounts Settings", "Accounts Settings",

3
pyproject.toml
View File

@ -39,3 +39,6 @@ force_grid_wrap = 0
use_parentheses = true use_parentheses = true
ensure_newline_before_comments = true ensure_newline_before_comments = true
indent = "\t" indent = "\t"
[tool.bench.frappe-dependencies]
frappe = ">=16.0.0-dev,<17.0.0"