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.

Sign up for GitHub

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

Jump to bottom

Decouple job and mixins #624

Merged
merged 57 commits into from Jan 11, 2012
Merged

Decouple job and mixins #624

merged 57 commits into from Jan 11, 2012

Commits on Dec 23, 2011

  1. Added self.job member to Mixin base class 

    Now all of the calculators can start retrieving parameters self.job, instead of self.

This is a good first step towards decouple the job and the calculator.
    @larsbutler
    larsbutler committed Dec 23, 2011
    Configuration menu
    Copy the full SHA
    6ec0821 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2011

  1. Ginormous refactoring job here. Job objects are now fully decoupled f… 

    …rom the mixin/calculators

Things are really messy right now

I'll need at least 2 more branches: 1 for cleanup and 1 for implementing proper calculator structure
    @larsbutler
    larsbutler committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    b4ce1c8 View commit details
    Browse the repository at this point in the history

  2. Did some pep8 cleanup and deleted some unused modules

    @larsbutler
    larsbutler committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    026b90b View commit details
    Browse the repository at this point in the history

  3. pylint/pep8

    @larsbutler
    larsbutler committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    f39006f View commit details
    Browse the repository at this point in the history

  4. Merged master

    @larsbutler
    larsbutler committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    e79a360 View commit details
    Browse the repository at this point in the history

  5. removed unused imports

    @larsbutler
    larsbutler committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    29a40b0 View commit details
    Browse the repository at this point in the history

  6. pylint

    @larsbutler
    larsbutler committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    5905554 View commit details
    Browse the repository at this point in the history

  7. pep8 cleanup

    @larsbutler
    larsbutler committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    406200d View commit details
    Browse the repository at this point in the history

  8. Removed some commented code.

    @larsbutler
    larsbutler committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    a08c2c1 View commit details
    Browse the repository at this point in the history

  9. reverting some changes to db upgrade scripts

    @larsbutler
    larsbutler committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    d6e0b3b View commit details
    Browse the repository at this point in the history

  10. reverting some changes to db upgrade script

    @larsbutler
    larsbutler committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    73cd204 View commit details
    Browse the repository at this point in the history

  11. reverting another change to db upgrade script

    @larsbutler
    larsbutler committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    0bf35fc View commit details
    Browse the repository at this point in the history

  12. Corrected a comment

    @larsbutler
    larsbutler committed Dec 28, 2011
    Configuration menu
    Copy the full SHA
    b6ae330 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2011

  1. Deleted an unused module (this code was moved to somewhere else)

    @larsbutler
    larsbutler committed Dec 29, 2011
    Configuration menu
    Copy the full SHA
    710d08d View commit details
    Browse the repository at this point in the history

  2. Fixed a circular import

    @larsbutler
    larsbutler committed Dec 29, 2011
    Configuration menu
    Copy the full SHA
    82dccd6 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2012

  1. Merge branch 'master' of github.com:gem/openquake into decouple-job-a… 

    …nd-mixins
    @larsbutler
    larsbutler committed Jan 4, 2012
    Configuration menu
    Copy the full SHA
    d8d30db View commit details
    Browse the repository at this point in the history

  2. removed some superfluous calculator map code.. what was I thinking? =P

    @larsbutler
    larsbutler committed Jan 4, 2012
    Configuration menu
    Copy the full SHA
    44938d2 View commit details
    Browse the repository at this point in the history

  3. pylint

    @larsbutler
    larsbutler committed Jan 4, 2012
    Configuration menu
    Copy the full SHA
    13475fc View commit details
    Browse the repository at this point in the history

  4. pylint

    @larsbutler
    larsbutler committed Jan 4, 2012
    Configuration menu
    Copy the full SHA
    521339e View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2012

  1. Merging master

    @larsbutler
    larsbutler committed Jan 5, 2012
    Configuration menu
    Copy the full SHA
    796f276 View commit details
    Browse the repository at this point in the history

  2. pylint

    @larsbutler
    larsbutler committed Jan 5, 2012
    Configuration menu
    Copy the full SHA
    afb7321 View commit details
    Browse the repository at this point in the history

  3. Fixed celeryconfig imports

    @larsbutler
    larsbutler committed Jan 5, 2012
    Configuration menu
    Copy the full SHA
    5371707 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2012

  1. Reverting a change to upgrade script

    @larsbutler
    larsbutler committed Jan 9, 2012
    Configuration menu
    Copy the full SHA
    aad949c View commit details
    Browse the repository at this point in the history

  2. Revert "Reverting a change to upgrade script" 

    This reverts commit aad949c.
    @larsbutler
    larsbutler committed Jan 9, 2012
    Configuration menu
    Copy the full SHA
    0863c78 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2012

  1. Added self.job member to Mixin base class 

    Now all of the calculators can start retrieving parameters self.job, instead of self.

This is a good first step towards decouple the job and the calculator.
    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    da8ca4e View commit details
    Browse the repository at this point in the history

  2. Ginormous refactoring job here. Job objects are now fully decoupled f… 

    …rom the mixin/calculators

Things are really messy right now

I'll need at least 2 more branches: 1 for cleanup and 1 for implementing proper calculator structure
    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    1054a7f View commit details
    Browse the repository at this point in the history

  3. Did some pep8 cleanup and deleted some unused modules

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    58f7c55 View commit details
    Browse the repository at this point in the history

  4. pylint/pep8

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    390e17e View commit details
    Browse the repository at this point in the history

  5. removed unused imports

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    548efe9 View commit details
    Browse the repository at this point in the history

  6. pylint

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    8efe804 View commit details
    Browse the repository at this point in the history

  7. pep8 cleanup

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    d923a77 View commit details
    Browse the repository at this point in the history

  8. Removed some commented code.

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    536cf8c View commit details
    Browse the repository at this point in the history

  9. reverting some changes to db upgrade scripts

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    d08c504 View commit details
    Browse the repository at this point in the history

  10. reverting some changes to db upgrade script

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    12d6ffc View commit details
    Browse the repository at this point in the history

  11. reverting another change to db upgrade script

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    a772bc8 View commit details
    Browse the repository at this point in the history

  12. Corrected a comment

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    956ff38 View commit details
    Browse the repository at this point in the history

  13. Deleted an unused module (this code was moved to somewhere else)

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    104bb73 View commit details
    Browse the repository at this point in the history

  14. Fixed a circular import

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    282110e View commit details
    Browse the repository at this point in the history

  15. removed some superfluous calculator map code.. what was I thinking? =P

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    2ee6ee4 View commit details
    Browse the repository at this point in the history

  16. pylint

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    4d6c9b5 View commit details
    Browse the repository at this point in the history

  17. pylint

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    cd1e846 View commit details
    Browse the repository at this point in the history

  18. pylint

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    470ece4 View commit details
    Browse the repository at this point in the history

  19. Fixed celeryconfig imports

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    4d97fd6 View commit details
    Browse the repository at this point in the history

  20. Reverting a change to upgrade script

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    27fe910 View commit details
    Browse the repository at this point in the history

  21. Revert "Reverting a change to upgrade script" 

    This reverts commit aad949c.
    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    2dacdb4 View commit details
    Browse the repository at this point in the history

  22. Fixed merge conflicts

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    064235c View commit details
    Browse the repository at this point in the history

  23. pylint/pep8

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    ca52dfd View commit details
    Browse the repository at this point in the history

  24. Merging master

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    5d8a0fa View commit details
    Browse the repository at this point in the history

  25. added missing docstring

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    e8450e9 View commit details
    Browse the repository at this point in the history

  26. silencing a false pylint warning

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    25b1bb2 View commit details
    Browse the repository at this point in the history

  27. pep8/pylint/pyflakes

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    d605853 View commit details
    Browse the repository at this point in the history

  28. Removed some superfluous code fron bin/openquake

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    0dfb2bb View commit details
    Browse the repository at this point in the history

  29. Merge branch 'master' of github.com:gem/openquake into decouple-job-a… 

    …nd-mixins
    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    b7054da View commit details
    Browse the repository at this point in the history

  30. pyflakes

    @larsbutler
    larsbutler committed Jan 10, 2012
    Configuration menu
    Copy the full SHA
    f2f0507 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2012

  1. Merged master

    @larsbutler
    larsbutler committed Jan 11, 2012
    Configuration menu
    Copy the full SHA
    21a71f7 View commit details
    Browse the repository at this point in the history

  2. Fixing some bugs from merges

    @larsbutler
    larsbutler committed Jan 11, 2012
    Configuration menu
    Copy the full SHA
    0d67444 View commit details
    Browse the repository at this point in the history

  3. fixed a typo

    @larsbutler
    larsbutler committed Jan 11, 2012
    Configuration menu
    Copy the full SHA
    c5b714b View commit details
    Browse the repository at this point in the history