Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DOC] Add JOSS badges #815

Merged
merged 9 commits into from
Oct 25, 2021
Merged

[DOC] Add JOSS badges #815

merged 9 commits into from
Oct 25, 2021

Conversation

tsalo
Copy link
Member

@tsalo tsalo commented Oct 12, 2021

Closes #669.

Changes proposed in this pull request:

  • Add JOSS badge to README.md and docs/index.rst.
  • Add JOSS citation to README and docs/index.rst.
  • Add JOSS citation to package-level duecredit decorator.
  • Add JOSS citation as reference to tedana and t2smap workflow docstrings.
  • Add JOSS citation to the tedana boilerplate.

@tsalo
Copy link
Member Author

tsalo commented Oct 12, 2021

isort isn't running correctly 😭🤣

Traceback (most recent call last):
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/flake8/plugins/manager.py", line 161, in load_plugin
    self._load()
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/flake8/plugins/manager.py", line 138, in _load
    self._plugin = self.entry_point.load()
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/importlib_metadata/__init__.py", line 167, in load
    module = import_module(match.group('module'))
  File "/opt/conda/envs/tedana_py37/lib/python3.7/importlib/__init__.py", line 127, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1006, in _gcd_import
  File "<frozen importlib._bootstrap>", line 983, in _find_and_load
  File "<frozen importlib._bootstrap>", line 967, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 677, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 728, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/flake8_isort.py", line 3, in <module>
    from isort import SortImports
ImportError: cannot import name 'SortImports' from 'isort' (/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/isort/__init__.py)

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/opt/conda/envs/tedana_py37/bin/flake8", line 8, in <module>
    sys.exit(main())
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/flake8/main/cli.py", line 22, in main
    app.run(argv)
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/flake8/main/application.py", line 375, in run
    self._run(argv)
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/flake8/main/application.py", line 363, in _run
    self.initialize(argv)
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/flake8/main/application.py", line 343, in initialize
    self.find_plugins(config_finder)
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/flake8/main/application.py", line 163, in find_plugins
    self.check_plugins.load_plugins()
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/flake8/plugins/manager.py", line 422, in load_plugins
    plugins = list(self.manager.map(load_plugin))
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/flake8/plugins/manager.py", line 309, in map
    yield func(self.plugins[name], *args, **kwargs)
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/flake8/plugins/manager.py", line 420, in load_plugin
    return plugin.load_plugin()
  File "/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/flake8/plugins/manager.py", line 168, in load_plugin
    raise failed_to_load
flake8.exceptions.FailedToLoadPlugin: Flake8 failed to load plugin "I00" due to cannot import name 'SortImports' from 'isort' (/opt/conda/envs/tedana_py37/lib/python3.7/site-packages/isort/__init__.py).
make: *** [Makefile:15: lint] Error 1

@jbteves
Copy link
Collaborator

jbteves commented Oct 12, 2021

Do we need to pin a particular version?

@notZaki
Copy link
Contributor

notZaki commented Oct 12, 2021

I think the current PR installed flake8-isort-3.0.0 whereas the main branch used flake8-isort-4.0.0. Setting a minimum version to "flake8-isort>=4", here

"flake8-isort",

might fix it. Not sure why it downgraded---for some reason, the most recent version of flake8 wants to use an older version of flake8-isort.

For reference, the logs of the environment are linked: [this PR] [main]
The installed versions are listed all the way at the bottom of the log.

EDIT: Issue 1409 on flake8's repo has some discussion on this. Looks like pip has trouble resolving the correct versions.

@notZaki
Copy link
Contributor

notZaki commented Oct 14, 2021

The upstream issue should now be fixed, so re-running the build might fix it---unless if circle-ci decides to re-use the old cache, in which case, any edit to info.py should force it to start from a clean slate.

@codecov
Copy link

codecov bot commented Oct 14, 2021

Codecov Report

Merging #815 (d789c3f) into main (5399ca5) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #815   +/-   ##
=======================================
  Coverage   93.27%   93.27%           
=======================================
  Files          27       27           
  Lines        2215     2217    +2     
=======================================
+ Hits         2066     2068    +2     
  Misses        149      149           
Impacted Files Coverage Δ
tedana/workflows/t2smap.py 96.29% <ø> (ø)
tedana/__init__.py 100.00% <100.00%> (ø)
tedana/workflows/tedana.py 89.92% <100.00%> (+0.03%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4d5c645...d789c3f. Read the comment docs.

@tsalo
Copy link
Member Author

tsalo commented Oct 14, 2021

Thanks @notZaki! It passed.

README.md Outdated Show resolved Hide resolved
Copy link
Collaborator

@jbteves jbteves left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @tsalo !

Copy link
Collaborator

@jbteves jbteves left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add:

  • duecredit
  • citation on README
  • citation on index.rst
  • references in workflow

@tsalo
Copy link
Member Author

tsalo commented Oct 15, 2021

@jbteves okay I think I got them all. I also cited the paper in the workflow boilerplate.

@jbteves
Copy link
Collaborator

jbteves commented Oct 15, 2021

Right now the first reference is numbered and subsequent ones are not. I lean towards asking that all of them be numbered rather than asking you to remove the first one's number, but I could go either way.

@tsalo
Copy link
Member Author

tsalo commented Oct 15, 2021

Hm.. it wasn't numbered when I checked, but I guess that's because the Zenodo website was down at the time so the function must not have been working. I'll change it back.

@tsalo tsalo requested review from jbteves and emdupre October 18, 2021 15:59
Copy link
Member

@emdupre emdupre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM ! TY, @tsalo !! 📖

Copy link
Collaborator

@jbteves jbteves left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @tsalo !

@tsalo tsalo merged commit 28a0c46 into ME-ICA:main Oct 25, 2021
@tsalo tsalo deleted the joss-badges branch October 25, 2021 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

JOSS manuscript
4 participants