Merge branch 'staging' into v5.x

Author: gavindsouza

.flake8

@@ -0,0 +1,37 @@
+[flake8]
+ignore =
+    E121,
+    E126,
+    E127,
+    E128,
+    E203,
+    E225,
+    E226,
+    E231,
+    E241,
+    E251,
+    E261,
+    E265,
+    E302,
+    E303,
+    E305,
+    E402,
+    E501,
+    E741,
+    W291,
+    W292,
+    W293,
+    W391,
+    W503,
+    W504,
+    F403,
+    B007,
+    B950,
+    W191,
+    E124, # closing bracket, irritating while writing QB code
+    E131, # continuation line unaligned for hanging indent
+    E123, # closing bracket does not match indentation of opening bracket's line
+    E101, # ensured by use of black
+    B009, # allow usage of getattr
+
+max-line-length = 200

.github/workflows/release.yml

@@ -6,20 +6,24 @@ on:
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
-      - name: Checkout Entire Repository
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Setup Node.js v14
-        uses: actions/setup-node@v2
+      - uses: actions/setup-node@v2
         with:
           node-version: 14
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
       - name: Setup dependencies
         run: |
           npm install @semantic-release/git @semantic-release/exec --no-save
-          pip install wheel twine
+          python3 -m pip install wheel twine
+          python3 -m pip install git+https://github.com/pypa/hatch
+
       - name: Create Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.pre-commit-config.yaml

@@ -0,0 +1,37 @@
+exclude: '.git'
+default_stages: [commit]
+fail_fast: false
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: trailing-whitespace
+        files: "frappe.*"
+        exclude: ".*json$|.*txt$|.*csv|.*md|.*svg"
+      - id: check-yaml
+      - id: check-merge-conflict
+      - id: check-ast
+      - id: check-json
+      - id: check-toml
+      - id: check-yaml
+      - id: debug-statements
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.34.0
+    hooks:
+      - id: pyupgrade
+        args: ['--py37-plus']
+
+  - repo: https://github.com/adityahase/black
+    rev: 9cb0a69f4d0030cdf687eddf314468b39ed54119
+    hooks:
+      - id: black
+        additional_dependencies: ['click==8.0.4']
+
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.9.2
+    hooks:
+      - id: flake8
+        additional_dependencies: ['flake8-bugbear',]
+        args: ['--config', '.flake8']

.releaserc

@@ -10,7 +10,7 @@
 		],
 		[
 			"@semantic-release/exec", {
-				"prepareCmd": "python setup.py bdist_wheel --universal"
+				"prepareCmd": "hatch build -t sdist -t wheel"
 			}
 		],
 		[

.travis.yml

@@ -5,11 +5,6 @@ sudo: true
 git:
   depth: 1
 
-cache:
-  - pip
-  - npm
-  - yarn
-
 addons:
   mariadb: '10.3'
 
@@ -30,18 +25,18 @@ matrix:
     env: TEST=bench
     script: python bench/tests/test_init.py TestBenchInit.basic
 
-  - name: "Python 3.7 Production Setup"
-    python: 3.7
+  - name: "Python 3.10 Basic Setup"
+    python: "3.10"
     env: TEST=bench
-    script: python bench/tests/test_setup_production.py TestSetupProduction.production
+    script: python bench/tests/test_init.py TestBenchInit.basic
 
-  - name: "Python 3.8 Production Setup"
-    python: 3.8
+  - name: "Python 3.7 Production Setup"
+    python: 3.7
     env: TEST=bench
     script: python bench/tests/test_setup_production.py TestSetupProduction.production
 
-  - name: "Python 3.9 Production Setup"
-    python: 3.9
+  - name: "Python 3.10 Production Setup"
+    python: "3.10"
     env: TEST=bench
     script: python bench/tests/test_setup_production.py TestSetupProduction.production
 
@@ -50,31 +45,24 @@ matrix:
     env: TEST=bench
     script: python -m unittest -v bench.tests.test_utils && python -m unittest -v bench.tests.test_init
 
-  - name: "Python 3.8 Tests"
-    python: 3.8
-    env: TEST=bench
-    script: python -m unittest -v bench.tests.test_utils && python -m unittest -v bench.tests.test_init
-
-  - name: "Python 3.9 Tests"
-    python: 3.9
+  - name: "Python 3.10 Tests"
+    python: "3.10"
     env: TEST=bench
     script: python -m unittest -v bench.tests.test_utils && python -m unittest -v bench.tests.test_init
 
 install:
-  - pip3 install urllib3 pyOpenSSL ndg-httpsclient pyasn1
+  - python -m pip install -U --no-cache-dir --force-reinstall urllib3 pyOpenSSL ndg-httpsclient pyasn1 wheel setuptools pip
 
   - if [ $TEST == "bench" ];then
-        wget -q -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 https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb;
+      sudo apt install ./wkhtmltox_0.12.6-1.focal_amd64.deb;
 
       nvm install 14;
       nvm use 14;
 
       mkdir -p ~/.bench;
       cp -r $TRAVIS_BUILD_DIR/* ~/.bench;
-      pip3 install -q -U -e ~/.bench;
+      python -m pip install -U -e ~/.bench;
 
       mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'";
       mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'";

README.md

@@ -1,5 +1,8 @@
 <div align="center">
-	<img src="https://github.com/frappe/design/raw/master/logos/png/bench-logo.png" height="128">
+	<picture>
+		<source media="(prefers-color-scheme: dark)" srcset="https://github.com/frappe/design/raw/master/logos/png/bench-logo-dark.png">
+		<img src="https://github.com/frappe/design/raw/master/logos/png/bench-logo.png" height="128">
+	</picture>
 	<h2>Bench</h2>
 </div>