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

[WIP] Port from STORM to peewee and add python3 support #33

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open

[WIP] Port from STORM to peewee and add python3 support #33

wants to merge 45 commits into from

Commits on Jul 11, 2019

  1. Change storm for peewee, and related cleanup 

    for python3 compatibility. At this point search_SAMADhi.py works from a
python3 pip-installed version - much more testing needed.
    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    5c52a39 View commit details
    Browse the repository at this point in the history

  2. Update CMSSW install script

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    8428890 View commit details
    Browse the repository at this point in the history

  3. Fixes for sample-result links and Sample.__str__

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    de84094 View commit details
    Browse the repository at this point in the history

  4. SAMADhi.py: defaults, fixes, and documentation

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    b7f657a View commit details
    Browse the repository at this point in the history

  5. Automatic tests: install pytest, test module for models 

    added --database argument to command-line script, to use an alternative
database (which may be an sqlite file for testing)
    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    b39e97f View commit details
    Browse the repository at this point in the history

  6. rename userPrompt.py to utils.py

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    e5a94c8 View commit details
    Browse the repository at this point in the history

  7. Move helper methods from scripts to utils.py

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    bc739f9 View commit details
    Browse the repository at this point in the history

  8. Remove debug printout

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    7e2caf3 View commit details
    Browse the repository at this point in the history

  9. fixes, no replacement of wildcards for sqlite (tests), add 'iSAMADhi'… 

    … shell script
    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    246de1c View commit details
    Browse the repository at this point in the history

  10. models: use 'id' attribute for key (and column_name)

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    af67f9f View commit details
    Browse the repository at this point in the history

  11. test: add infrastructure for cli tests; catch more warnings

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    8bb45bf View commit details
    Browse the repository at this point in the history

  12. add_sample.py testing: various fixes, added '--continue' flag to disa… 

    …ble prompts
    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    2b9db70 View commit details
    Browse the repository at this point in the history

  13. Fixes for tests in python3, non-CMSSW environment 

    - setup.cfg: alias such that 'python setup.py test' runs pytest
- import cppyy instead of ROOT (avoid atexit error with setup.py test)
- silence mysql version warning also outside CMSSW
- update .gitignore
    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    d95341e View commit details
    Browse the repository at this point in the history

  14. Tests, fixes, and --continue for add_result.py

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    166387e View commit details
    Browse the repository at this point in the history

  15. add imports from __future__ to all modules

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    a073018 View commit details
    Browse the repository at this point in the history

  16. Add tox config, no unicode_literals in setup.py, input from builtins … 

    …(future package) for python3.7 compatibility
    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    1c7bcd9 View commit details
    Browse the repository at this point in the history

  17. Avoid test failures due to wrong permissions of (fake) credentials file

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    a548e54 View commit details
    Browse the repository at this point in the history

  18. test coverage and fixes for das_import

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    6062a67 View commit details
    Browse the repository at this point in the history

  19. basic update_dataset_cross_section.py test

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    92eefc9 View commit details
    Browse the repository at this point in the history

  20. Improve compute_sample_luminosity

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    2bd6fc6 View commit details
    Browse the repository at this point in the history

  21. dbAnalysis fixes

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    4155324 View commit details
    Browse the repository at this point in the history

  22. checkAndClean fixes

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    235af39 View commit details
    Browse the repository at this point in the history

  23. doc updates: remove old standalone install script

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    dedacca View commit details
    Browse the repository at this point in the history

  24. Add .travis.yml

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    2de36ee View commit details
    Browse the repository at this point in the history

  25. Add future to cmssw install, detect voms-proxy-info command

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    9e72371 View commit details
    Browse the repository at this point in the history

  26. skipif logic...

    @pieterdavid
    pieterdavid committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    ef4988f View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2019

  1. Fix removeFiles, catch missing creation_time on DAS, and improve add_… 

    …sample
    @pieterdavid
    pieterdavid committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    c280ae7 View commit details
    Browse the repository at this point in the history

  2. fix search-and-replace error

    @pieterdavid
    pieterdavid committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    f2e0129 View commit details
    Browse the repository at this point in the history

  3. required args

    @pieterdavid
    pieterdavid committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    ad0718a View commit details
    Browse the repository at this point in the history

Commits on May 15, 2020

  1. Need to have name and datatype for a dataset before importing

    @pieterdavid
    pieterdavid committed May 15, 2020
    Configuration menu
    Copy the full SHA
    ddadfef View commit details
    Browse the repository at this point in the history

Commits on May 19, 2020

  1. use entry_points for iSAMADhi and das_import

    @pieterdavid
    pieterdavid committed May 19, 2020
    Configuration menu
    Copy the full SHA
    517201c View commit details
    Browse the repository at this point in the history

  2. drop '-format json' for dasgoclient, just '-json' is simpler

    @pieterdavid
    pieterdavid committed May 19, 2020
    Configuration menu
    Copy the full SHA
    9d223cf View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. Move script main methods to cp3_llbb.SAMADhi.scripts or the module th… 

    …ey logically belong with, and use entry_points/console_scripts
    @pieterdavid
    pieterdavid committed May 20, 2020
    Configuration menu
    Copy the full SHA
    1ee3e8a View commit details
    Browse the repository at this point in the history

  2. fix a typo, rename scripts in tests

    @pieterdavid
    pieterdavid committed May 20, 2020
    Configuration menu
    Copy the full SHA
    ae7521b View commit details
    Browse the repository at this point in the history

  3. typo, forgot a few fixes in tests

    @pieterdavid
    pieterdavid committed May 20, 2020
    Configuration menu
    Copy the full SHA
    2bb892f View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2021

  1. das import for centrally produced NanoAOD samples

    @pieterdavid
    pieterdavid committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    3b79e8a View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2021

  1. pre-commit fixes

    @pieterdavid
    pieterdavid committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    5bf44f1 View commit details
    Browse the repository at this point in the history

  2. Move to setup.py-less install (pyproject.toml and setup.cfg)

    @pieterdavid
    pieterdavid committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    4dc037f View commit details
    Browse the repository at this point in the history

  3. fix setup.cfg formatting

    @pieterdavid
    pieterdavid committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    f6b98a1 View commit details
    Browse the repository at this point in the history

  4. black code style

    @pieterdavid
    pieterdavid committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    52f18f0 View commit details
    Browse the repository at this point in the history

  5. logger in tests, flake8 config

    @pieterdavid
    pieterdavid committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    a96724e View commit details
    Browse the repository at this point in the history

  6. Try to run tox in github actions

    @pieterdavid
    pieterdavid committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    af7df4f View commit details
    Browse the repository at this point in the history

  7. isolated build for tox

    @pieterdavid
    pieterdavid committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    bc7e68f View commit details
    Browse the repository at this point in the history

  8. fix typo

    @pieterdavid
    pieterdavid committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    121b9f5 View commit details
    Browse the repository at this point in the history

  9. Set buildsystem backend

    @pieterdavid
    pieterdavid committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    785e0d0 View commit details
    Browse the repository at this point in the history