Skip to content

Commit

Permalink
changes grant information in .zenodo.json and adds acknowledgements t… (
Browse files Browse the repository at this point in the history
#189)

* changes grant information in .zenodo.json and adds acknowledgements to readme

* drops Python 3.5 and adds 3.8 for testing

* changes the travis yml accordingly
  • Loading branch information
derNarr authored Nov 2, 2020
1 parent 7a488dd commit f90202d
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 12 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ python:
- 3.8
- 3.7
- 3.6
- 3.5

install:
- pip3 install --upgrade pip # all three OSes agree about 'pip3'
Expand Down
21 changes: 13 additions & 8 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,21 @@
"title": "Alexander von Humboldt Professorship awarded to R. H. Baayen"
},
{
"acronym": "WIDE",
"code": "742545",
"funder": {
"acronyms": [
"EC"
],
"name": "European Commission"
"links": {
"self": "https://zenodo.org/api/grants/10.13039/501100000780::742545"
},
"program": "ERC",
"title": "Wide Incremental learning with Discrimination nEtworks"
"title": "Wide Incremental learning with Discrimination nEtworks",
"acronym": "WIDE",
"program": "H2020",
"funder": {
"doi": "10.13039/501100000780",
"acronyms": [],
"name": "European Commission",
"links": {
"self": "https://zenodo.org/api/funders/10.13039/501100000780"
}
}
}
],
"keywords": [
Expand Down
8 changes: 8 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,11 @@ contributers have a look at `Github's Contributor summary

Currently, it is maintained by `Konstantin Sering <https://github.com/derNarr>`_
and `Marc Weitz <https://github.com/trybnetic>`_.


Acknowledgments
===============
This research was supported by an ERC advanced Grant (no. 742545) and by the
Alexander von Humboldt Professorship awarded to R. H. Baayen and by the
University of Tübingen.

4 changes: 2 additions & 2 deletions pyndl/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
__author__ = ('Konstantin Sering, Marc Weitz, '
'David-Elias Künstle, Lennard Schneider')
__author_email__ = '[email protected]'
__version__ = '0.7.1'
__version__ = '0.7.2'
__license__ = 'MIT'
__description__ = ('Naive discriminative learning implements learning and '
'classification models based on the Rescorla-Wagner '
Expand All @@ -30,9 +30,9 @@
'Operating System :: POSIX :: Linux',
'Operating System :: MacOS',
'Programming Language :: Python',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3 :: Only',
'Topic :: Scientific/Engineering',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{35,36}-test, checkstyle, documentation
envlist = py{36,37,38}-test, checkstyle, documentation

[testenv]
usedevelop = True
Expand Down

0 comments on commit f90202d

Please sign in to comment.