Merge 29fcdf9 into 046b0ba

brian-team · Jan 6, 2021 · 512fb25 · 512fb25
2 parents 046b0ba + 29fcdf9
commit 512fb25
Show file tree

Hide file tree

Showing 5 changed files with 166 additions and 201 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.rst b/README.rst
@@ -75,9 +75,6 @@ To run the test suite:
 Testing status for master branch
 --------------------------------
 
-.. image:: https://travis-ci.com/brian-team/brian2.svg?branch=master
-    :target: https://travis-ci.com/brian-team/brian2
-
 .. image:: https://dev.azure.com/brian-team/Brian2/_apis/build/status/brian-team.brian2?branchName=master
   :target: https://dev.azure.com/brian-team/Brian2/_build/latest?definitionId=3&branchName=master
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,41 +1,145 @@
-jobs:
+variables:
+  COVERALLS_TOKEN: $(coveralls_repo_token)
 
-- job: 'Windows'
-  timeoutInMinutes: 0
-  pool:
-    vmImage: 'vs2017-win2016'
-  strategy:
-    matrix:
-      Python37_runtime_1:
-        python.version: '3.7'
-        script_name: dev/continuous-integration/run_test_suite.py
-        standalone: false
-        split_run: 1
-      Python37_runtime_2:
-        python.version: '3.7'
-        script_name: dev/continuous-integration/run_test_suite.py
-        standalone: false
-        split_run: 2
-      Python37_standalone:
-        python.version: '3.7'
-        script_name: dev/continuous-integration/run_test_suite.py
-        standalone: true
-      Python37_runtime_1_32bit:
-        python.version: '3.7'
-        script_name: dev/continuous-integration/run_test_suite.py
-        standalone: false
-        float_dtype_32: true
-        split_run: 1
-      Python37_runtime_2_32bit:
-        python.version: '3.7'
-        script_name: dev/continuous-integration/run_test_suite.py
-        standalone: false
-        float_dtype_32: true
-        split_run: 2
-      Python37_standalone_32bit:
-        python.version: '3.7'
-        script_name: dev/continuous-integration/run_test_suite.py
-        standalone: true
-        float_dtype_32: true
-  steps:
-  - template: dev/continuous-integration/azure-steps.yml
+stages:
+  - stage: TestSuite
+    displayName: Test suite
+    jobs:
+    - job: 'Linux'
+      timeoutInMinutes: 0
+      pool:
+        vmImage: 'ubuntu-20.04'
+      strategy:
+        matrix:
+          Python36_runtime_1:
+            python.version: '3.6'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: false
+            split_run: 1
+          Python39_runtime_1:
+            python.version: '3.9'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: false
+            split_run: 1
+          Python38_runtime_1:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: false
+            split_run: 1
+            upload_coverage : true
+          Python38_runtime_2:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: false
+            split_run: 2
+            upload_coverage : true
+          Python38_standalone:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: true
+            upload_coverage : true
+          Python38_runtime_1_32bit:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: false
+            float_dtype_32: true
+            split_run: 1
+          Python38_runtime_2_32bit:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: false
+            float_dtype_32: true
+            split_run: 2
+          Python38_standalone_32bit:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: true
+            float_dtype_32: true
+      steps:
+      - template: dev/continuous-integration/azure-steps.yml
+
+    - job: 'OS_X'
+      timeoutInMinutes: 0
+      pool:
+        vmImage: 'macOS-10.15'
+      strategy:
+        matrix:
+          Python38_runtime_1:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: false
+            split_run: 1
+          Python38_runtime_2:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: false
+            split_run: 2
+          Python38_standalone:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: true
+      steps:
+      - template: dev/continuous-integration/azure-steps.yml
+
+    - job: 'Windows'
+      timeoutInMinutes: 0
+      pool:
+        vmImage: 'vs2017-win2016'
+      strategy:
+        matrix:
+          Python38_runtime_1:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: false
+            split_run: 1
+          Python38_runtime_2:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: false
+            split_run: 2
+          Python38_standalone:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: true
+          Python38_runtime_1_32bit:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: false
+            float_dtype_32: true
+            split_run: 1
+          Python38_runtime_2_32bit:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: false
+            float_dtype_32: true
+            split_run: 2
+          Python38_standalone_32bit:
+            python.version: '3.8'
+            script_name: dev/continuous-integration/run_test_suite.py
+            standalone: true
+            float_dtype_32: true
+      steps:
+      - template: dev/continuous-integration/azure-steps.yml
+
+  - stage: notify_coveralls
+    displayName: Notify coveralls of test completion
+    jobs:
+      - job: coveralls
+        pool: server
+        steps:
+          - task: InvokeRESTAPI@1
+            inputs:
+              serviceConnection: coveralls
+              urlSuffix: '?repo_token=$(COVERALLS_TOKEN)'
+              headers: |
+                {
+                "Content-Type": "application/json"
+                }
+              body: |
+                {
+                  "payload": {
+                       "build_num": "$(Build.BuildNumber)",
+                       "status": "done"
+                  }
+                }
+              successCriteria: eq(root['done'], true)
diff --git a/dev/continuous-integration/azure-steps.yml b/dev/continuous-integration/azure-steps.yml
@@ -15,13 +15,31 @@ steps:
 
   - bash: |
       source activate $HOME/test_env
-      conda install --quiet --yes -c conda-forge pytest cython sympy future pyparsing numpy jinja2 six scipy sphinx gsl
+      conda install --quiet --yes -c conda-forge pytest cython sympy future pyparsing numpy jinja2 six scipy sphinx gsl coverage
       pip install .
     displayName: 'Install Brian2'
 
   - bash: |
       source activate $HOME/test_env
       SOURCE_PATH=$(pwd)
       cd ..  # move out of the source directory to avoid direct import
-      python $SOURCE_PATH/$(script_name)
+      coverage run --rcfile=$SOURCE_PATH/.coveragerc $SOURCE_PATH/$(script_name)
+    env:
+      AGENT_OS: $(Agent.OS)
     displayName: 'Run tests'
+
+  - bash: |
+      # We use the Circle CI support
+      pip install coveralls
+      cp ../.coverage .
+      export CIRCLE_BRANCH=$BUILD_SOURCEBRANCH
+      coveralls --rcfile=.coveragerc
+    env:
+      CIRCLECI: 1
+      CIRCLE_BUILD_NUM: $(Build.BuildNumber)
+      CIRCLE_BRANCH: $(Build.SourceBranchName)
+      COVERALLS_FLAG_NAME: $(System.JobName)
+      COVERALLS_REPO_TOKEN: $(coveralls_repo_token)
+      COVERALLS_PARALLEL: true
+    displayName: 'Upload coverage data to coveralls'
+    condition: eq(variables.upload_coverage, true)