Skip to content

Commit

Permalink
Merge branch 'version-14' into validate_customizations
Browse files Browse the repository at this point in the history
  • Loading branch information
agritheory authored Feb 9, 2024
2 parents 16adc48 + 605aae6 commit ef1a581
Show file tree
Hide file tree
Showing 15 changed files with 1,428 additions and 120 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:

- name: Find JSON changes
id: changed-json
uses: tj-actions/changed-files@v23.1
uses: tj-actions/changed-files@v37
with:
files: |
**/*.json
Expand Down
34 changes: 20 additions & 14 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ repos:
rev: v4.3.0
hooks:
- id: trailing-whitespace
files: 'frappe.*'
exclude: '.*json$|.*txt$|.*csv|.*md|.*svg'
files: "cloud_storage.*"
exclude: ".*json$|.*txt$|.*csv|.*md|.*svg"
- id: check-yaml
- id: no-commit-to-branch
args: ['--branch', 'develop']
Expand All @@ -23,7 +23,7 @@ repos:
rev: v2.34.0
hooks:
- id: pyupgrade
args: ['--py310-plus']
args: ['--py38-plus']

- repo: https://github.com/frappe/black
rev: 951ccf4d5bb0d692b457a5ebc4215d755618eb68
Expand All @@ -37,20 +37,26 @@ repos:
types_or: [javascript]
# Ignore any files that might contain jinja / bundles
exclude: |
(?x)^(
frappe/public/dist/.*|
.*node_modules.*|
(?x)^(
.*boilerplate.*|
frappe/www/website_script.js|
frappe/templates/includes/.*|
frappe/public/js/lib/.*
)$
.*node_modules.*|
cloud_storage/public/dist/.*|
cloud_storage/public/js/lib/.*|
cloud_storage/templates/includes/.*|
cloud_storage/www/website_script.js
)$
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
hooks:
- id: isort

- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
hooks:
- id: flake8
additional_dependencies: ['flake8-bugbear']
additional_dependencies: ['flake8-bugbear',]

- repo: local
hooks:
Expand All @@ -62,6 +68,6 @@ repos:
types: [python]

ci:
autoupdate_schedule: weekly
skip: []
submodules: false
autoupdate_schedule: weekly
skip: []
submodules: false
2 changes: 1 addition & 1 deletion cloud_storage/cloud_storage/custom/file.json
Original file line number Diff line number Diff line change
Expand Up @@ -339,4 +339,4 @@
}
],
"sync_on_migrate": 1
}
}
Original file line number Diff line number Diff line change
@@ -1,40 +1,59 @@
{
"actions": [],
"creation": "2023-03-20 12:48:05.086487",
"default_view": "List",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": ["link_doctype", "link_name"],
"fields": [
{
"fieldname": "link_doctype",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Document Type",
"options": "DocType",
"reqd": 1
},
{
"fieldname": "link_name",
"fieldtype": "Dynamic Link",
"in_list_view": 1,
"label": "Document Name",
"options": "link_doctype",
"reqd": 1
}
],
"istable": 1,
"links": [],
"modified": "2023-03-22 12:37:44.883229",
"modified_by": "Administrator",
"module": "Cloud Storage",
"name": "File Association",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
"actions": [],
"creation": "2023-03-20 12:48:05.086487",
"default_view": "List",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"link_doctype",
"link_name",
"user",
"timestamp"
],
"fields": [
{
"fieldname": "link_doctype",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Document Type",
"options": "DocType",
"reqd": 1
},
{
"fieldname": "link_name",
"fieldtype": "Dynamic Link",
"in_list_view": 1,
"label": "Document Name",
"options": "link_doctype",
"reqd": 1
},
{
"fieldname": "timestamp",
"fieldtype": "Datetime",
"in_list_view": 1,
"label": "Timestamp",
"read_only": 1
},
{
"fieldname": "user",
"fieldtype": "Link",
"in_list_view": 1,
"label": "User",
"options": "User"
}
],
"istable": 1,
"links": [],
"modified": "2023-09-27 23:42:57.356690",
"modified_by": "Administrator",
"module": "Cloud Storage",
"name": "File Association",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
Empty file.
46 changes: 46 additions & 0 deletions cloud_storage/cloud_storage/doctype/file_version/file_version.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"actions": [],
"creation": "2023-07-06 05:38:35.891393",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"version",
"user",
"timestamp"
],
"fields": [
{
"fieldname": "version",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Version",
"read_only": 1
},
{
"fieldname": "timestamp",
"fieldtype": "Datetime",
"in_list_view": 1,
"label": "Timestamp",
"read_only": 1
},
{
"fieldname": "user",
"fieldtype": "Link",
"in_list_view": 1,
"label": "User",
"options": "User"
}
],
"istable": 1,
"links": [],
"modified": "2023-09-27 23:45:54.628246",
"modified_by": "Administrator",
"module": "Cloud Storage",
"name": "File Version",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copyright (c) 2023, AgriTheory and contributors
# For license information, please see license.txt

# import frappe
from frappe.model.document import Document


class FileVersion(Document):
pass
Loading

0 comments on commit ef1a581

Please sign in to comment.