Skip to content

Commit

Permalink
[MAINT] Update setup configuration (#303)
Browse files Browse the repository at this point in the history
* Clean up setup info.

* Add pyproject.toml.
  • Loading branch information
tsalo committed Aug 9, 2020
1 parent 5a0e000 commit 154fbc1
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 56 deletions.
21 changes: 10 additions & 11 deletions .github/config.yml
Expand Up @@ -3,32 +3,31 @@
# Comment to be posted to on PRs from first time contributors in your repository
newPRWelcomeComment: >
Thanks for opening this pull request!
We have detected this is the first time for you to contribute
to *fMRIPrep*.
We have detected this is the first time you have contributed
to *NiMARE*.
Please check out our [contributing guidelines](https://github.com/neurostuff/NiMARE/blob/master/CONTRIBUTING.md).
We invite you to list yourself as a *fMRIPrep* contributor, so if your name
We invite you to list yourself as a *NiMARE* contributor, so if your name
is not already mentioned, please modify the
[``.zenodo.json``](https://github.com/neurostuff/NiMARE/blob/master/.zenodo.json)
file with your data right above Russ' entry. Example:
file with your data right above Angie's entry. Example:
```
{
"name": "Contributor, New NiMARE",
"affiliation": "Department of Psychology, Some University",
"orcid": "<your id>"
"name": "Contributor, New",
"affiliation": "Department of Psychology, Some University",
"orcid": "<your id>"
},
{
"name": "Salo, Taylor P.",
"affiliation": "Department of Psychology, Florida International University",
"orcid": "0000-0001-9813-3167"
"name": "Laird, Angela R.",
"affiliation": "Florida International University",
"orcid": "0000-0003-3379-8744"
},
```
Of course, if you want to opt out this time there is no
problem at all with adding your name later.
You will be always welcome to add it in the future whenever
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
@@ -1,5 +1,5 @@
<!---
This is a suggested pull request template for tedana.
This is a suggested pull request template for NiMARE.
It's designed to capture information we've found to be useful in reviewing pull requests.
If there is other information that would be helpful to include, please don't hesitate to add it!
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
@@ -1,4 +1,4 @@
.vscode/settings.json
.vscode/

historical/
docs/_build/
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Expand Up @@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at tyarkoni@utexas.edu. All
reported by contacting the project team at **tyarkoni@utexas.edu**. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
@@ -1,6 +1,6 @@
# Contributing to NiMARE

Welcome to the NiMARE repository! We're excited you're here and want to contribute.
Welcome to the NiMARE repository! We're excited you're here and want to contribute.

These guidelines are designed to make it as easy as possible to get involved. If you have any questions that aren't discussed below, please let us know by opening an [issue][link_issues]!

Expand All @@ -18,7 +18,7 @@ By starting the governance structure early in our development, we hope to welcom
We are committed to continuing to update the governance structures as necessary.
Every member of the ``NiMARE`` community is encouraged to comment on these processes and suggest improvements.

As the first interim [Benevolent Dictator for Life (BDFL)](https://en.wikipedia.org/wiki/Benevolent_dictator_for_life), Taylor Salo is ultimately responsible for any major decisions pertaining to ``NiMARE`` development.
As the first project leader, Taylor Salo is ultimately responsible for any major decisions pertaining to ``NiMARE`` development.
However, all potential changes are explicitly and openly discussed in the described channels of communication, and we strive for consensus amongst all community members.

## Code of conduct
Expand Down
21 changes: 0 additions & 21 deletions get_version.py

This file was deleted.

27 changes: 27 additions & 0 deletions pyproject.toml
@@ -0,0 +1,27 @@
[build-system]
requires = ["setuptools>=40.8", "wheel"]

[tool.black]
line-length = 99
target-version = ['py37']
include = '\.pyi?$'
exclude = '''
(
/(
\.eggs # exclude a few common directories in the
| \.git # root of the project
| \.github
| \.hg
| \.pytest_cache
| _build
| build
| dist
)/
| get_version.py
| versioneer.py
| nimare/info.py
| nimare/_version.py
| nimare/due.py
)
'''
26 changes: 7 additions & 19 deletions setup.py
@@ -1,17 +1,15 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
""" NiMARE setup script """
import versioneer
from io import open
import os.path as op
from inspect import getfile, currentframe
from setuptools import setup, find_packages


def main():
""" Install entry-point """
import pprint
import versioneer
from io import open
import os.path as op
from inspect import getfile, currentframe
from setuptools import setup, find_packages

ver_file = op.join('nimare', 'info.py')
with open(ver_file) as f:
exec(f.read())
Expand All @@ -25,17 +23,7 @@ def main():
}

root_dir = op.dirname(op.abspath(getfile(currentframe())))

version = None
cmdclass = {}
if op.isfile(op.join(root_dir, 'nimare', 'VERSION')):
with open(op.join(root_dir, 'nimare', 'VERSION')) as vfile:
version = vfile.readline().strip()
pkg_data['nimare'].insert(0, 'VERSION')

if version is None:
version = versioneer.get_version()
cmdclass = versioneer.get_cmdclass()
cmdclass = versioneer.get_cmdclass()

setup(
name=vars['PACKAGENAME'],
Expand All @@ -55,7 +43,7 @@ def main():
tests_require=vars['TESTS_REQUIRES'],
extras_require=vars['EXTRA_REQUIRES'],
entry_points=vars['ENTRY_POINTS'],
packages=find_packages(exclude=("tests",)),
packages=find_packages(exclude=('tests',)),
package_data=pkg_data,
zip_safe=False,
cmdclass=cmdclass
Expand Down

0 comments on commit 154fbc1

Please sign in to comment.