Merge remote-tracking branch 'upstream/maint/3.1.x'

effigies · effigies · commit 7bc31e5a0214 · 2020-05-24T19:40:36.000-04:00
diff --git a/.zenodo.json b/.zenodo.json
@@ -88,7 +88,9 @@
       "orcid": "0000-0002-5544-7577"
     },
     {
-      "name": "Guidotti, Roberto"
+      "affiliation": "Department of Computer Science, Aalto University, Espoo, Finland and Department of Neuroscience, Imaging and Clinical Sciences, University G. D'Annunzio, Chieti, Italy",
+      "name": "Guidotti, Roberto",
+      "orcid": "0000-0002-0807-6005"
     },
     {
       "name": "Duek, Or"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -5,7 +5,6 @@ jobs:
     name: Windows
     vmImage: windows-2019
     matrix:
-      py35-x86:
       py36-x86:
         PYTHON_VERSION: '3.6'
         PYTHON_ARCH: 'x86'

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,9 @@`
`88`	`88`	`"orcid": "0000-0002-5544-7577"`
`89`	`89`	`},`
`90`	`90`	`{`
`91`		`- "name": "Guidotti, Roberto"`
	`91`	`+ "affiliation": "Department of Computer Science, Aalto University, Espoo, Finland and Department of Neuroscience, Imaging and Clinical Sciences, University G. D'Annunzio, Chieti, Italy",`
	`92`	`+ "name": "Guidotti, Roberto",`
	`93`	`+ "orcid": "0000-0002-0807-6005"`
`92`	`94`	`},`
`93`	`95`	`{`
`94`	`96`	`"name": "Duek, Or"`