Merge pull request #1163 from frappe/staging

chore: Merge staging into v5.x
frappe · Apr 27, 2021 · 8932ea5 · 8932ea5
2 parents 9a06924 + dc924dd
commit 8932ea5
Show file tree

Hide file tree

Showing 34 changed files with 326 additions and 344 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,6 +23,6 @@ jobs:
       - name: Create Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TEST_PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-          TEST_PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+          PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
         run: npx semantic-release
diff --git a/.travis.yml b/.travis.yml
@@ -15,35 +15,20 @@ addons:
 
 matrix:
   include:
-  - name: "Python 2.7 Basic Setup"
-    python: 2.7
-    env: TEST=bench
-    script: python bench/tests/test_init.py TestBenchInit.basic
-
-  - name: "Python 3.6 Basic Setup"
-    python: 3.6
-    env: TEST=bench
-    script: python bench/tests/test_init.py TestBenchInit.basic
-
   - name: "Python 3.7 Basic Setup"
     python: 3.7
     env: TEST=bench
     script: python bench/tests/test_init.py TestBenchInit.basic
 
-  - name: "Python 3.8 Production Setup"
+  - name: "Python 3.8 Basic Setup"
     python: 3.8
     env: TEST=bench
-    script: python bench/tests/test_setup_production.py TestSetupProduction.production
-
-  - name: "Python 2.7 Production Setup"
-    python: 2.7
-    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.6 Production Setup"
-    python: 3.6
+  - name: "Python 3.9 Basic Setup"
+    python: 3.9
     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.7 Production Setup"
     python: 3.7
@@ -55,20 +40,25 @@ matrix:
     env: TEST=bench
     script: python bench/tests/test_setup_production.py TestSetupProduction.production
 
-  - name: "Python 2.7 Tests"
-    python: 2.7
+  - name: "Python 3.9 Production Setup"
+    python: 3.9
     env: TEST=bench
-    script: python -m unittest -v bench.tests.test_init
+    script: python bench/tests/test_setup_production.py TestSetupProduction.production
 
   - name: "Python 3.7 Tests"
     python: 3.7
     env: TEST=bench
     script: python -m unittest -v bench.tests.test_init
 
-  - name: "Python 3.5 Easy Install"
-    python: 3.5
-    env: TEST=easy_install
-    script: sudo python $TRAVIS_BUILD_DIR/install.py --user travis --run-travis --production --verbose
+  - name: "Python 3.8 Tests"
+    python: 3.8
+    env: TEST=bench
+    script: python -m unittest -v bench.tests.test_init
+
+  - name: "Python 3.9 Tests"
+    python: 3.9
+    env: TEST=bench
+    script: python -m unittest -v bench.tests.test_init
 
   - name: "Python 3.7 Easy Install"
     python: 3.7
@@ -80,6 +70,11 @@ matrix:
     env: TEST=easy_install
     script: sudo python $TRAVIS_BUILD_DIR/install.py --user travis --run-travis --production --verbose
 
+  - name: "Python 3.9 Easy Install"
+    python: 3.9
+    env: TEST=easy_install
+    script: sudo python $TRAVIS_BUILD_DIR/install.py --user travis --run-travis --production --verbose
+
 install:
   - pip install urllib3 pyOpenSSL ndg-httpsclient pyasn1
 

diff --git a/README.md b/README.md
@@ -8,12 +8,10 @@ Bench is a command-line utility that helps you to install, update, and manage mu
 ## Table of Contents
 
  - [Installation](#installation)
-	- [Docker Installation](#docker-installation)
-		- [Development Setup](#docker-installation-for-development)
-		- [Production Setup](#docker-installation-for-production)
+	- [Containerized Installation](#docker-installation)
 	- [Easy Install Script](#easy-install-script)
 	- [Manual Installation](#manual-installation)
- - [Usage](#usage)
+ - [Usage](#basic-usage)
  - [Custom Bench commands](#custom-bench-commands)
  - [Bench Manager](#bench-manager)
  - [Guides](#guides)
@@ -28,7 +26,7 @@ A typical bench setup provides two types of environments &mdash; Development and
 
 The setup for each of these installations can be achieved in multiple ways:
 
- - [Docker Installation](#docker-installation)
+ - [Containerized Installation](#containerized-installation)
  - [Easy Install Script](#easy-install-script)
  - [Manual Installation](#manual-installation)
 
@@ -37,7 +35,7 @@ We recommend using either the Docker Installation or the Easy Install Script to
 Otherwise, if you are looking to evaluate ERPNext, you can also download the [Virtual Machine Image](https://erpnext.com/download) or register for [a free trial on erpnext.com](https://erpnext.com/pricing).
 
 
-### Docker Installation
+### Containerized Installation
 
 A Frappe/ERPNext instance can be setup and replicated easily using [Docker](https://docker.com). The officially supported Docker installation can be used to setup either of both Development and Production environments.
 
@@ -48,56 +46,7 @@ $ git clone https://github.com/frappe/frappe_docker.git
 $ cd frappe_docker
 ```
 
-A quick setup guide for both the envionments can be found below. For more details, check out the [Frappe/ERPNext Docker Repository](https://github.com/frappe/frappe_docker).
-
-#### Docker Installation for Development
-
-To setup a development environment for Docker, follow the [Frappe/ERPNext Docker for Development Guide](https://github.com/frappe/frappe_docker/blob/develop/development/README.md).
-
-#### Docker Installation for Production
-
-Copy the `env-example` file to `.env`
-
-```sh
-$ cp env-example .env
-```
-
-Optionally, you may also setup an [NGINX Proxy for SSL Certificates](https://github.com/evertramos/docker-compose-letsencrypt-nginx-proxy-companion) with auto-renewal for your Production instance. We recommend this for instances being accessed over the internet. For this to work, the DNS needs to be configured correctly so that [LetsEncrypt](https://letsencrypt.org) can verify the domain. To setup the proxy, run the following commands:
-
-```sh
-$ git clone https://github.com/evertramos/docker-compose-letsencrypt-nginx-proxy-companion.git
-$ cd docker-compose-letsencrypt-nginx-proxy-companion
-$ cp .env.sample .env
-$ ./start.sh
-```
-
-To get the Production instance running, run the following command:
-
-```sh
-$ docker-compose \
-    --project-name <project-name> \
-    -f installation/docker-compose-common.yml \
-    -f installation/docker-compose-erpnext.yml \
-    -f installation/docker-compose-networks.yml \
-    --project-directory installation up -d
-```
-
-Make sure to replace `<project-name>` with whatever you wish to call it. This should get the instance running through docker. Now, to create a new site on the instance you may run:
-
-```sh
-docker exec -it \
-    -e "SITE_NAME=$SITE_NAME" \
-    -e "DB_ROOT_USER=$DB_ROOT_USER" \
-    -e "MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD" \
-    -e "ADMIN_PASSWORD=$ADMIN_PASSWORD" \
-    -e "INSTALL_APPS=erpnext" \ # optional, if you want to install any other apps
-    <project-name>_erpnext-python_1 docker-entrypoint.sh new
-```
-
-Once this is done, you may access the instance at `$SITE_NAME`.
-
-**Note:** The Production setup does not contain, require, or use bench. For a list of substitute commands, check out the [Frappe/ERPNext Docker Site Operations](https://github.com/frappe/frappe_docker/#site-operations).
-
+A quick setup guide for both the environments can be found below. For more details, check out the [Frappe/ERPNext Docker Repository](https://github.com/frappe/frappe_docker).
 
 ### Easy Install Script