Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .cookiecutter_version
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Updated with template from Starktail/frappe_app_cookiecutter

Link to check if this is outdated: https://github.com/Starktail/frappe_app_cookiecutter/compare/80911ee6689096630098ed15f1449e76b7f9914b..main

cookiecutter_template_commit_id: 80911ee6689096630098ed15f1449e76b7f9914b
cookiecutter_template_commit_date: 2026-02-05T12:54:43+00:00
124 changes: 124 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
{
"env": {
"browser": true,
"node": true,
"es2022": true
},
"parserOptions": {
"sourceType": "module"
},
"extends": "eslint:recommended",
"rules": {
"indent": "off",
"brace-style": "off",
"no-mixed-spaces-and-tabs": "off",
"no-useless-escape": "off",
"space-unary-ops": ["error", { "words": true }],
"linebreak-style": "off",
"quotes": ["off"],
"semi": "off",
"camelcase": "off",
"no-unused-vars": "off",
"no-console": ["warn"],
"no-extra-boolean-cast": ["off"],
"no-control-regex": ["off"],
},
"root": true,
"globals": {
"frappe": true,
"Vue": true,
"SetVueGlobals": true,
"__": true,
"repl": true,
"Class": true,
"locals": true,
"cint": true,
"cstr": true,
"cur_frm": true,
"cur_dialog": true,
"cur_page": true,
"cur_list": true,
"cur_tree": true,
"msg_dialog": true,
"is_null": true,
"in_list": true,
"has_common": true,
"posthog": true,
"has_words": true,
"validate_email": true,
"open_web_template_values_editor": true,
"validate_name": true,
"validate_phone": true,
"validate_url": true,
"get_number_format": true,
"format_number": true,
"format_currency": true,
"comment_when": true,
"open_url_post": true,
"toTitle": true,
"lstrip": true,
"rstrip": true,
"strip": true,
"strip_html": true,
"replace_all": true,
"flt": true,
"precision": true,
"CREATE": true,
"AMEND": true,
"CANCEL": true,
"copy_dict": true,
"get_number_format_info": true,
"strip_number_groups": true,
"print_table": true,
"Layout": true,
"web_form_settings": true,
"$c": true,
"$a": true,
"$i": true,
"$bg": true,
"$y": true,
"$c_obj": true,
"refresh_many": true,
"refresh_field": true,
"toggle_field": true,
"get_field_obj": true,
"get_query_params": true,
"unhide_field": true,
"hide_field": true,
"set_field_options": true,
"getCookie": true,
"getCookies": true,
"get_url_arg": true,
"md5": true,
"$": true,
"jQuery": true,
"moment": true,
"hljs": true,
"Awesomplete": true,
"Sortable": true,
"Showdown": true,
"Taggle": true,
"Gantt": true,
"Slick": true,
"Webcam": true,
"PhotoSwipe": true,
"PhotoSwipeUI_Default": true,
"io": true,
"JsBarcode": true,
"L": true,
"Chart": true,
"DataTable": true,
"Cypress": true,
"cy": true,
"it": true,
"describe": true,
"expect": true,
"context": true,
"before": true,
"beforeEach": true,
"after": true,
"qz": true,
"localforage": true,
"extend_cscript": true
}
}
23 changes: 12 additions & 11 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,27 @@ body:
label: Environment and Versions
description: |
examples:
- **Frappe Version**: v15.6.9
- **ERPNext Version**: v15.6.9
- **South Africa Customisations Version**: v0.6.2
- **Frappe Version**: v15.88.0
- **ERPNext Version**: v15.88.0
- **South Africa Customisations** (csf_za): v0.6.2
value: |
- Frappe Version:
- ERPNext Version:
- South Africa Customisations Version:
- South Africa Customisations:
render: markdown
validations:
required: false
- type: dropdown
id: version
attributes:
label: Operating System
description: On what OS are you seeing the problem on?
label: Hosting Method
description: How is frappe installed/used?
multiple: true
options:
- Windows
- MacOS
- Android
- iOS
- Frappe Cloud
- Custom Frappe Press instance
- Remote or local Docker Instance
- Barebones
- Other
validations:
required: true
Expand All @@ -74,4 +74,5 @@ body:
- Microsoft Edge
- Firefox
- Safari
- Other
- Other
- N/A
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Finfoot Tech
url: https://finfoot.tech
about: More information on Finfoot Tech.
- name: Starktail (Pty) Ltd
url: https://starktail.com
about: More information on Starktail.
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

## Type of change

- Bug fix (change which fixes an issue)
- 🟢 New feature (change which adds functionality)
- Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Bug fix (change which fixes an issue)
- [ ] New feature (change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)


## Tests
Expand Down
19 changes: 14 additions & 5 deletions .github/helper/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ cd ~ || exit

sudo apt update
sudo apt remove mysql-server mysql-client
sudo apt install libcups2-dev redis-server mariadb-client-10.6
sudo apt install libcups2-dev redis-server mariadb-client libmariadb-dev
# Dependencies for cypress: https://docs.cypress.io/guides/continuous-integration/introduction#UbuntuDebian
sudo apt-get install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb

pip install frappe-bench

Expand All @@ -25,10 +27,9 @@ mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "GRANT ALL PRIVILEGES ON
mariadb --host 127.0.0.1 --port 3306 -u root -proot -e "FLUSH PRIVILEGES"

install_whktml() {
wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
sudo chmod o+x /usr/local/bin/wkhtmltopdf
wget -O /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb
sudo apt install /tmp/wkhtmltox.deb

}
install_whktml &

Expand All @@ -39,7 +40,11 @@ sed -i 's/schedule:/# schedule:/g' Procfile
sed -i 's/socketio:/# socketio:/g' Procfile
sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile

# Get dependent apps

bench get-app https://github.com/frappe/erpnext --branch $TEST_AGAINST_ERPNEXT_VERSION --resolve-deps


bench get-app --overwrite csf_za "${GITHUB_WORKSPACE}"
bench --verbose setup env --python python3.10
bench --verbose setup requirements --dev
Expand All @@ -48,5 +53,9 @@ bench start &>> ~/frappe-bench/bench_start.log &
CI=Yes bench build --app frappe &
bench --site test_site reinstall --yes

# Install dependent apps

bench --verbose --site test_site install-app erpnext


bench --verbose --site test_site install-app csf_za
23 changes: 16 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ concurrency:
cancel-in-progress: true

env:
TEST_AGAINST_FRAPPE_VERSION: v15.57.2
TEST_AGAINST_ERPNEXT_VERSION: v15.54.1
TEST_AGAINST_FRAPPE_VERSION: v15.96.0

TEST_AGAINST_ERPNEXT_VERSION: v15.94.3


jobs:
tests:
Expand All @@ -29,17 +31,21 @@ jobs:
MYSQL_ROOT_PASSWORD: root
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3

steps:
- name: Clone
uses: actions/checkout@v4

- name: Find tests
run: |
echo "Finding tests"
grep -rn "def test" > /dev/null

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: |
3.10
python-version: '3.10'

- name: Setup Node
uses: actions/setup-node@v3
Expand All @@ -52,7 +58,7 @@ jobs:
echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts

- name: Cache pip
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py', '**/setup.cfg') }}
Expand All @@ -62,7 +68,7 @@ jobs:

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
run: 'echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT'

- name: Cache yarn
uses: actions/cache@v3
Expand Down Expand Up @@ -108,6 +114,8 @@ jobs:
export FRAPPE_TUNE_GC=True
bench start &> bench_start.log &
bench --site test_site run-ui-tests csf_za --headless -- --record


env:
TYPE: server
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
Expand All @@ -133,3 +141,4 @@ jobs:
if: ${{ failure() }}
run: |
cat ~/frappe-bench/bench_start.log

3 changes: 2 additions & 1 deletion .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# Workflow for building and deploying a VitePress site to GitHub Pages
#
name: Deploy VitePress site to Pages
Expand Down Expand Up @@ -57,4 +58,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
uses: actions/deploy-pages@v4
Loading