Merge branch 'master' into rate_models

Author: chaoming0625

.github/workflows/Linux_CI.yml

@@ -5,9 +5,9 @@ name: Linux CI
 
 on:
   push:
-    branches: [ master, brainpy-2.x ]
+    branches: [ master ]
   pull_request:
-    branches: [ master, brainpy-2.x ]
+    branches: [ master ]
 
 
 jobs:
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9"]
+        python-version: ["3.6", "3.7", "3.8", "3.9"]
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/MacOS_CI.yml

@@ -5,18 +5,17 @@ name: MacOS CI
 
 on:
   push:
-    branches: [ master, brainpy-2.x ]
+    branches: [ master ]
   pull_request:
-    branches: [ master, brainpy-2.x ]
+    branches: [ master ]
 
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-10.15, macos-11, macos-latest]
         python-version: ["3.7", "3.8", "3.9"]
 
     steps:

.github/workflows/Sync_branches.yml

@@ -0,0 +1,18 @@
+name: Sync multiple branches
+on:
+  pull_request:
+    branches:
+      - master
+jobs:
+  sync-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Merge master -> brainpy-2.x
+        uses: devmasx/[email protected]
+        with:
+          type: now
+          from_branch: master
+          target_branch: brainpy-2.x
+          github_token: ${{ github.token }}

.github/workflows/Windows_CI.yml

@@ -5,9 +5,9 @@ name: Windows CI
 
 on:
   push:
-    branches: [ master, brainpy-2.x ]
+    branches: [ master ]
   pull_request:
-    branches: [ master, brainpy-2.x ]
+    branches: [ master ]
 
 
 jobs:

.github/workflows/contributors.yml

@@ -2,6 +2,8 @@ name: Add contributors
 on:
   schedule:
     - cron:  '20 20 * * *'
+  push:
+    branches: [ master ]
 
 jobs:
   add-contributors:

README.md

@@ -263,13 +263,12 @@ analyzer.show_figure()
 </p> 
 
 
+
 ### 6. More others
 
 For **more functions and examples**, please refer to the [documentation](https://brainpy.readthedocs.io/) and [examples](https://brainpy-examples.readthedocs.io/).
 
 
-
-
 ## License
 
 [GNU General Public License v3.0](https://github.com/PKU-NIP-Lab/BrainPy/blob/master/LICENSE)

requirements-dev.txt

@@ -1,6 +1,6 @@
 -r requirements.txt
 
-matplotlib>=3.4
+matplotlib>=3.3
 jaxlib>=0.1.64
 sympy>=1.6
 scipy>=1.1.0