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

FIX: Move TraitType import, handle API change for NoDefaultSpecified #3159

Merged
merged 1 commit into from
Jan 30, 2020

Conversation

effigies
Copy link
Member

Summary

Addresses #3157 in maint/1.4.x.

After merging, maint/1.4.x should be merged into master.

List of changes proposed in this PR (pull-request)

Acknowledgment

  • (Mandatory) I acknowledge that this contribution will be available under the Apache 2 license.

@effigies effigies added this to the 1.5.0 milestone Jan 30, 2020
@codecov
Copy link

codecov bot commented Jan 30, 2020

Codecov Report

Merging #3159 into maint/1.4.x will decrease coverage by 0.33%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##           maint/1.4.x    #3159      +/-   ##
===============================================
- Coverage        67.60%   67.27%   -0.34%     
===============================================
  Files              299      299              
  Lines            39503    39506       +3     
  Branches          5219     5219              
===============================================
- Hits             26707    26576     -131     
- Misses           12087    12173      +86     
- Partials           709      757      +48     
Flag Coverage Δ
#smoketests 50.96% <100.00%> (-2.04%) ⬇️
#unittests 64.86% <100.00%> (+<0.01%) ⬆️
Impacted Files Coverage Δ
nipype/__init__.py 57.81% <0.00%> (ø) ⬆️

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 792988f...d06b847. Read the comment docs.

@effigies effigies merged commit 29ac6c2 into nipy:maint/1.4.x Jan 30, 2020
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.

2 participants