Skip to content

Merging develop into provenance_design#2191

Merged
sphuber merged 7 commits into
aiidateam:provenance_redesignfrom
sphuber:provenance_redesign
Nov 13, 2018
Merged

Merging develop into provenance_design#2191
sphuber merged 7 commits into
aiidateam:provenance_redesignfrom
sphuber:provenance_redesign

Conversation

@sphuber
Copy link
Copy Markdown
Contributor

@sphuber sphuber commented Nov 12, 2018

No description provided.

sphuber and others added 7 commits November 11, 2018 17:08
…tespace (aiidateam#2186)

If a formula contains leading or trailing whitespace, one of the parts over
which the function loops will be empty, and so the regex match `m` will be
`None`. To prevent an `AttributeError` from being thrown when `group` is
called on `None` we check for it and continue.
orm.User is now a concrete class.  Also get_automatic_user has been
replaced by:

from aiida.orm import User

User.objects.get_default()
Now the backend will not normalize the email because all User creation
is done through the concrete frontend class.
@sphuber sphuber force-pushed the provenance_redesign branch from 0bda072 to 9b44b6a Compare November 13, 2018 08:08
@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage increased (+2.3%) to 67.586% when pulling 9b44b6a on sphuber:provenance_redesign into 28e2231 on aiidateam:provenance_redesign.

@sphuber sphuber merged commit 6674b7a into aiidateam:provenance_redesign Nov 13, 2018
@sphuber sphuber deleted the provenance_redesign branch November 13, 2018 08:36
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