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

Feature/collections class #91

Merged
merged 40 commits into from
Dec 14, 2016
Merged

Feature/collections class #91

merged 40 commits into from
Dec 14, 2016

Commits on Aug 31, 2016

  1. initial addition of collections class

    @granrothge
    granrothge committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    c48201f View commit details
    Browse the repository at this point in the history

  2. Added updated method

    @granrothge
    granrothge committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    c10466c View commit details
    Browse the repository at this point in the history

  3. added author affiliation

    @granrothge
    granrothge committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    927de92 View commit details
    Browse the repository at this point in the history

  4. added author affiliation

    @granrothge
    granrothge committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    097234e View commit details
    Browse the repository at this point in the history

  5. added scancollection package to the startup script

    @granrothge
    granrothge committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    3540882 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2016

  1. added more test data

    @granrothge
    granrothge committed Nov 23, 2016
    Configuration menu
    Copy the full SHA
    29087b8 View commit details
    Browse the repository at this point in the history

  2. added tests for the scan collection class

    @granrothge
    granrothge committed Nov 23, 2016
    Configuration menu
    Copy the full SHA
    edd9da6 View commit details
    Browse the repository at this point in the history

  3. updated makefile to include scancollection tests

    @granrothge
    granrothge committed Nov 23, 2016
    Configuration menu
    Copy the full SHA
    014ce14 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2016

  1. Merge branch 'master' into feature/collections_class

    @granrothge
    granrothge committed Dec 1, 2016
    Configuration menu
    Copy the full SHA
    61ccfd9 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2016

  1. Expanded Document string for waterfall and pcolor in Scans class

    @granrothge
    granrothge committed Dec 7, 2016
    Configuration menu
    Copy the full SHA
    484df1d View commit details
    Browse the repository at this point in the history

  2. fixed indention bug in scans.py

    @granrothge
    granrothge committed Dec 7, 2016
    Configuration menu
    Copy the full SHA
    4c7a57a View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2016

  1. expanded documentation for mean_col method in scans.py

    @granrothge
    granrothge committed Dec 8, 2016
    Configuration menu
    Copy the full SHA
    0289b96 View commit details
    Browse the repository at this point in the history

  2. add documentation for the scans class in scan.py

    @granrothge
    granrothge committed Dec 8, 2016
    Configuration menu
    Copy the full SHA
    ad05576 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2016

  1. ADD: conda recipe 

    Added a conda-recipe and updated installation documentation.
    @granrothge
    David M Fobes authored and granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    7fb583e View commit details
    Browse the repository at this point in the history

  2. ADD: automatic conda build on tagged releases 

    Added automatic building of conda packages on tagged releases
    @granrothge
    David M Fobes authored and granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    be6a0c0 View commit details
    Browse the repository at this point in the history

  3. initial addition of collections class

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    c6d073f View commit details
    Browse the repository at this point in the history

  4. Added updated method

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    2edbb9a View commit details
    Browse the repository at this point in the history

  5. added author affiliation

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    2c57c79 View commit details
    Browse the repository at this point in the history

  6. added author affiliation

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    9d8499b View commit details
    Browse the repository at this point in the history

  7. added scancollection package to the startup script

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    916863a View commit details
    Browse the repository at this point in the history

  8. added more test data

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    3698c53 View commit details
    Browse the repository at this point in the history

  9. added tests for the scan collection class

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    e750f32 View commit details
    Browse the repository at this point in the history

  10. updated makefile to include scancollection tests

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    f5c157e View commit details
    Browse the repository at this point in the history

  11. FIX: automatic Conda Build 

    Bash if then statement not correct for auto conda build

updated anaconda cloud neutronpy version

anaconda-client is required to upload the automatic builds.

Added encrypted token for anaconda cloud upload
    @granrothge
    David M Fobes authored and granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    a4f4439 View commit details
    Browse the repository at this point in the history

  12. FIX: anaconda cloud encrypted token 

    updated encrypted token for anaconda cloud upload
    @granrothge
    David M Fobes authored and granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    bb5ff0c View commit details
    Browse the repository at this point in the history

  13. Expanded Document string for waterfall and pcolor in Scans class

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    afc1986 View commit details
    Browse the repository at this point in the history

  14. fixed indention bug in scans.py

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    981f889 View commit details
    Browse the repository at this point in the history

  15. expanded documentation for mean_col method in scans.py

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    521f2e4 View commit details
    Browse the repository at this point in the history

  16. add documentation for the scans class in scan.py

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    4fc0e86 View commit details
    Browse the repository at this point in the history

  17. renamed class name to Scans from scan

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    01e3fea View commit details
    Browse the repository at this point in the history

  18. added an import of Scans to the data/__init__.py file

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    1413481 View commit details
    Browse the repository at this point in the history

  19. added a doc string to the top of the scans.py file

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    120fb86 View commit details
    Browse the repository at this point in the history

  20. updated test_scans.py for moving scans.py

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    90d2c8b View commit details
    Browse the repository at this point in the history

  21. update make file for test_scans.py change

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    102c6cc View commit details
    Browse the repository at this point in the history

  22. updated setu.py to match the updated scans.py

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    2aa548d View commit details
    Browse the repository at this point in the history

  23. updated test_scans for updated scans.py

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    68834d1 View commit details
    Browse the repository at this point in the history

  24. fixed merge conflict in Makefile

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    4953c6c View commit details
    Browse the repository at this point in the history

  25. removed test_scancollection.py

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    e2d10cf View commit details
    Browse the repository at this point in the history

  26. removed scancollection directory

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    b551b76 View commit details
    Browse the repository at this point in the history

  27. fixed setup.py

    @granrothge
    granrothge committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    2a29af8 View commit details
    Browse the repository at this point in the history