Skip to content

Move requirements from setup_requirements.py to setup.json#2307

Merged
sphuber merged 10 commits into
aiidateam:provenance_redesignfrom
ltalirz:issue_2241_separate_setup_json
Dec 6, 2018
Merged

Move requirements from setup_requirements.py to setup.json#2307
sphuber merged 10 commits into
aiidateam:provenance_redesignfrom
ltalirz:issue_2241_separate_setup_json

Conversation

@ltalirz
Copy link
Copy Markdown
Member

@ltalirz ltalirz commented Dec 6, 2018

fix #2241

This moves all dependency information from the setup_requirements.py python file to a setup.json.

  • this makes it easier for plugin developers to process dependencies of aiida-core
  • once merged, aiida-core can easily be registered on the aiida-plugin-registry.
    This will allow us to implement automatic checks on collisions of entry points
  • add pre-commit hook to update version number in setup.json
    (necessary to keep it there for the registration in the registry)
  • remove pylint blacklist from .pylintrc. the only blacklist is now in .pre-commit-config.yaml
  • remove setup.py from blacklist
  • remove dev_spinxext extra (contained only pytest, made part of testing)

@ltalirz
Copy link
Copy Markdown
Member Author

ltalirz commented Dec 6, 2018

still one thing to fix, will reopen in a bit

@ltalirz ltalirz closed this Dec 6, 2018
@ltalirz
Copy link
Copy Markdown
Member Author

ltalirz commented Dec 6, 2018

done

@ltalirz ltalirz reopened this Dec 6, 2018
Comment thread MANIFEST.in
include docs/source/images/*.png
include fastentrypoints.py
include setup_requirements.py
include utils/*
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Don't all python files get automatically included? The utils folder only has python files so it should be good no? Or is this necessary because it is outside the aiida package folder?

Comment thread setup.py Outdated
SETUP_JSON = json.load(info)

SETUP_JSON['extras_require'][
'testing'] += SETUP_JSON['extras_require']['rest'] \
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

weird position of 'testing' key on new line

Comment thread utils/validate_pyproject.py Outdated
from __future__ import absolute_import
import click
import os
from os import path
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is there a problem with using os.path, since we already import os anyway?

Comment thread utils/validate_version.py Outdated
sys.exit(1)

# Overwrite version in setup.json
#setup_content['version'] = VERSION
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

dead code

ltalirz and others added 2 commits December 6, 2018 16:22
@sphuber sphuber merged commit d4dce2d into aiidateam:provenance_redesign Dec 6, 2018
@coveralls
Copy link
Copy Markdown

coveralls commented Dec 8, 2018

Coverage Status

Coverage increased (+0.003%) to 68.906% when pulling 8da2afd on ltalirz:issue_2241_separate_setup_json into 782f38b on aiidateam:provenance_redesign.

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.

3 participants