RF: Cleanup Makefile to bring parity with CI, remove tox + nose references #1105
Conversation
…test target to re-use same script used in CI to orchestrate testing. Remove refererences to tox and nose
|
Hello @jacobdr, Thank you for updating! Cheers! There are no style issues detected in this Pull Request. 🍻 To test for issues locally, Comment last updated at 2022-05-07 19:05:52 UTC |
Codecov Report
@@ Coverage Diff @@
## master #1105 +/- ##
=======================================
Coverage 92.29% 92.29%
=======================================
Files 100 100
Lines 12247 12247
Branches 2393 2393
=======================================
Hits 11303 11303
Misses 621 621
Partials 323 323 Continue to review full report at Codecov.
|
…ure flake8 (closer aligns to pep8speaks bot behavior)
| @@ -252,11 +252,13 @@ sdist-venv: clean | |||
| rm -rf dist venv | |||
There was a problem hiding this comment.
I wasn't sure if this target is still being used anywhere -- so I kind of hacked it to install the dev dependencies to get it to pass on my local
| @@ -1,6 +1,8 @@ | |||
| # Requirements for building docs | |||
| -r requirements.txt | |||
| sphinx<3 | |||
| numpydoc | |||
| jinja2<3 | |||
There was a problem hiding this comment.
I needed to pin these to get version compatibility to work. In the future might be better to use a tool like poetry so that we can generate a lockfile and not have to deal with this sort of not-fun dependency pinning
There was a problem hiding this comment.
I needed this to get my local to pass but it seems like CI might not like it.... I'll try reverting to see if if this is what is breaking the pre-release CI jobs
| *test* | ||
| *sphinx* | ||
| nibabel/externals/* | ||
| */__init__.py | ||
| # temporary -- should be removed in another PR |
There was a problem hiding this comment.
Need a follow-up PR to clean up the remaining issues. I added these as ignores so that local flake8 passes. These were being covered up by the configuration of pep8speaks only looking at the diff
| source virtenv/bin/activate | ||
| elif [ -e virtenv/Scripts/activate ]; then | ||
| source virtenv/Scripts/activate | ||
| if [ -e venv/bin/activate ]; then |
There was a problem hiding this comment.
This change was made so that we are consistent in local dev and remote dev with the virtualenv
|
|
||
|
|
||
| ut-%: build |
There was a problem hiding this comment.
I removed this as I did not see it being used anywhere. I can revert this if a maintainer feels it should be brought back
|
@effigies all the pre-release tests failed for the same reason -- a string representation in a doctest for |
|
Trying to narrow differences... since As evidence, though, comparing against a prior (chose #1096 as the most recent unmerged green build I saw....) Python version comparison
Final note: the only pre-release job that passes is the one that does not have the PRE_PIP_FLAGS environment variable set.... |
| .PHONY: test-style | ||
| test-style: | ||
| export CHECK_TYPE=style; ./tools/ci/check.sh |
There was a problem hiding this comment.
I would rather put make style in check.sh than call check.sh from here. And likewise with other tests.
| .PHONY: test-style | |
| test-style: | |
| export CHECK_TYPE=style; ./tools/ci/check.sh | |
| .PHONY: style | |
| style: | |
| flake8 |
Closes #1104