Skip to content

rel: some housekeeping for 1.0 #2389

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

Merged
merged 6 commits into from
Jan 23, 2018
Merged

rel: some housekeeping for 1.0 #2389

merged 6 commits into from
Jan 23, 2018

Conversation

mgxd
Copy link
Member

@mgxd mgxd commented Jan 22, 2018

Changes proposed in this pull request

  • updated zenodo/mailmap
  • add missing autotests from make specs

@effigies
Copy link
Member

Looks good. We'll need a changelog update, but whether that's here or directly on master at release time is fine with me.

@effigies effigies added this to the 1.0 milestone Jan 22, 2018
nipype/info.py Outdated
@@ -148,6 +148,7 @@ def get_nipype_gitversion():
'pydotplus',
'pydot>=%s' % PYDOT_MIN_VERSION,
'packaging',
'yapf'
Copy link
Member

Choose a reason for hiding this comment

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

yapf is not a runtime dependency. it has been added to a new label called specs below.

Copy link
Member Author

Choose a reason for hiding this comment

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

ah didn't see this earlier - sorry for the clutter

@effigies
Copy link
Member

We may be good to go. Do we need to do any documentation updates before release? We'll need to establish processes for contributing to 1.x-maint vs 2.0-dev (or whatever we call the branches).

@satra
Copy link
Member

satra commented Jan 23, 2018

@effigies - till we get the engine in place (which should be highest priority for @djarecka in the next few weeks), we can go with current contribution process and do updates on the 1.x branch (leave master as is). as soon as the engine is ready and tested, we can create the 2.0 branch and start moving things over to the new engine.

@satra
Copy link
Member

satra commented Jan 23, 2018

@effigies - the only other thing i would do is to check and update the tutorial. i know @djarecka now has automated testing of the tutorial. it should be checked against master perhaps before 1.0 is checked off.

@djarecka
Copy link
Collaborator

i can do it

@satra
Copy link
Member

satra commented Jan 23, 2018

use current master (10.12pm eastern or later)

@djarecka
Copy link
Collaborator

unfortunately my tests are failing on graphs, it's likely not related to nipype itself, but I'll debug it tomorrow:
https://circleci.com/gh/djarecka/nipype_tutorial/34

@djarecka
Copy link
Collaborator

djarecka commented Jan 23, 2018

@satra @effigies were any changes to write_graph intended? Did we want to have a shorter name of files? After pep8 changes it's harder to use blame option in github...

write_graph is now inconsistent, if I call with graph2use='orig' I have workflow.dot.png, but if I use graph2use='colored' then I have file with a shorter name workflow.png.

@effigies
Copy link
Member

#2381 was meant to remove the .dot. I'll have a look.

@effigies
Copy link
Member

Good to merge and move tutorial discussion to #2397?

@effigies effigies merged commit 8043fc6 into nipy:master Jan 23, 2018
@mgxd mgxd deleted the rel/1.0 branch January 24, 2018 16:08
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.

4 participants