MAINT: Drop pytest-xdist requirement, minimum pytest version #2856
Conversation
Stop trying to make it a thing.
Codecov Report
@@ Coverage Diff @@
## master #2856 +/- ##
==========================================
- Coverage 67.46% 67.46% -0.01%
==========================================
Files 341 341
Lines 43392 43393 +1
Branches 5383 5382 -1
==========================================
- Hits 29276 29273 -3
- Misses 13419 13423 +4
Partials 697 697
Continue to review full report at Codecov.
|
docker/generate_dockerfiles.sh
Outdated
| @@ -108,6 +108,8 @@ function generate_main_dockerfile() { | |||
| --miniconda use_env=neuro \ | |||
| pip_opts="-e" \ | |||
| pip_install="/src/nipype[all]" \ | |||
There was a problem hiding this comment.
we could just add pytest-xdist here
There was a problem hiding this comment.
Not sure we want to install it in editable mode.
| @@ -11,10 +11,6 @@ neurdflib | |||
| click>=6.6.0 | |||
| funcsigs | |||
| configparser | |||
| pytest>=3.0 | |||
There was a problem hiding this comment.
Do we really need to maintain our dependencies in 2 locations - info, requirements? What are thoughts on replacing this file with a simple:
.
or
.[dev]
There was a problem hiding this comment.
I think that will also install the current repo, not just the dependencies, right?
There was a problem hiding this comment.
I don't really care, but that changes what pip install -r requirements.txt does. Do we know anybody who installs it that way, and what they desire from that?
@yarikoptic Does Debian use requirements.txt for anything?
There was a problem hiding this comment.
@mgxd Let's leave changing requirements.txt to another PR, where we can seek a consensus on the proper way to manage it.
| @@ -92,7 +92,7 @@ function generate_main_dockerfile() { | |||
| conda_install='python=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} | |||
| icu=58.1 libxml2 libxslt matplotlib mkl numpy paramiko | |||
| pandas psutil scikit-learn scipy traits=4.6.0' \ | |||
| pip_install="grabbit==0.1.2 https://github.com/INCF/pybids/tarball/0.6.5" \ | |||
| pip_install="pytest-xdist" \ | |||
There was a problem hiding this comment.
I removed the grabbit/pybids stuff, as it's not installed correctly to test BIDSDataGrabber, anyway. This should be fixed up in #2737.
1.1.8 (January 28, 2019) * FIX: ANTS LaplacianThickness cmdline opts fixed up (nipy#2846) * FIX: Resolve LinAlgError during SVD (nipy#2838) * ENH: Add interfaces wrapping DIPY worflows (nipy#2830) * ENH: Update BIDSDataGrabber for pybids 0.7 (nipy#2737) * ENH: Add FSL `eddy_quad` interface (nipy#2825) * ENH: Support tckgen -select in MRtrix3 v3+ (nipy#2823) * ENH: Support for BIDS event files (nipy#2845) * ENH: CompositeTransformUtil, new ANTs interface (nipy#2785) * RF: Move pytest and pytest-xdist from general requirement into tests_required (nipy#2850) * DOC: Add S3DataGrabber example (nipy#2849) * DOC: Skip conftest module in API generation (nipy#2852) * DOC: Hyperlink DOIs to preferred resolver (nipy#2833) * MAINT: Install numpy!=1.16.0 from conda in Docker (nipy#2862) * MAINT: Drop pytest-xdist requirement, minimum pytest version (nipy#2856) * MAINT: Disable numpy 1.16.0 for Py2.7 (nipy#2855) * tag '1.1.8': (79 commits) MNT: Add @feilong to .zenodo, update ordering MNT: Update .mailmap MNT: Update .zenodo ordering Accept invitation as Zenodo release co-author (see nipy#2864) MAINT: Update .mailmap BF: allowing bids_event_file as alternate input MNT: Update .zenodo ordering MNT: Version 1.1.8 DOC: 1.1.8 changelog Update nipype/interfaces/dipy/tracks.py Update nipype/interfaces/dipy/reconstruction.py MNT: Install numpy!=1.16.0 from conda in Docker Add FSL auto test remake specs Update nipype/interfaces/io.py Remove return type named tuple Update nipype/info.py STY: Whitespace, line length Remove out_ prefix from EddyQuad outputs Apply minor edits from code review ...
Summary
This is an addendum to #2854, following #2854 (comment). I'm basing off of master instead of @yarikoptic's branch to make sure tests still work. @yarikoptic Feel free to cherry-pick these pieces, if you like, but probably a good idea to wait to make sure that I'm not breaking things horribly. Or if you're happy with this and have nothing further to add, we can just merge this.
@satra @djarecka I believe you had strong feelings on pytest's place in everything, so might be worth a couple minutes of your time.
List of changes proposed in this PR (pull-request)
pytest-xdistfrom requirementspytest-xdist)pytest-xdistto Travis and CircleCI builds (via docker, in the latter case) for the sake of speedconfigparserrequirement into PEP508 format, as right now I think it's being ignored utterly, since we build with Python 3.Acknowledgment