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

Transfer Excel data I/O from message_ix #289

Merged
merged 44 commits into from
Mar 25, 2020
Merged

Transfer Excel data I/O from message_ix #289

merged 44 commits into from
Mar 25, 2020

Commits on Mar 23, 2020

  1. Add backend.io.s_write_excel

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    4d32748 View commit details
    Browse the repository at this point in the history

  2. Add backend.io.s_read_excel

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    6458b1a View commit details
    Browse the repository at this point in the history

  3. Expand TestScenario.test_excel_io

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    0613cf8 View commit details
    Browse the repository at this point in the history

  4. Adjust tests.backend.test_base.test_class

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    f551acc View commit details
    Browse the repository at this point in the history

  5. Remove unused utils.pd_read, .pd_write

    @khaeru
    khaeru committed Mar 23, 2020
    1 Configuration menu
    Copy the full SHA
    ddfe9e7 View commit details
    Browse the repository at this point in the history

  6. Coerce path inputs to {to,read}_excel to pathlib.Path

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    730c0a4 View commit details
    Browse the repository at this point in the history

  7. Handle old- and new-style sheets for index sets

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    5b8a705 View commit details
    Browse the repository at this point in the history

  8. Improve exception handling in JDBCBackend._get_item

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    3cdb804 View commit details
    Browse the repository at this point in the history

  9. Complete test_excel_io

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    89b128c View commit details
    Browse the repository at this point in the history

  10. Use Scenario.scheme if no model arg to Scenario.solve

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    543c010 View commit details
    Browse the repository at this point in the history

  11. Improve exception handling in JDBCBackend._get_item 2

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    2c75041 View commit details
    Browse the repository at this point in the history

  12. Document limitations of JDBCBackend

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    9c9894e View commit details
    Browse the repository at this point in the history

  13. Handle existing items with read_excel(…, init_items=True)

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    db38dd5 View commit details
    Browse the repository at this point in the history

  14. Scenario.add_set() with an empty key is a no-op

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    7469c12 View commit details
    Browse the repository at this point in the history

  15. Omit names from the item name -> ixmp type map if no data written

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    6f73837 View commit details
    Browse the repository at this point in the history

  16. Only log warning when reading sets/pars with mismatched idx_names

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    86b984a View commit details
    Browse the repository at this point in the history

  17. Update docstrings in backend.io

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    3a45711 View commit details
    Browse the repository at this point in the history

  18. Harmonize handling of exceptions, format strings in JDBCBackend

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    f110a4a View commit details
    Browse the repository at this point in the history

  19. Add 'export' and expand 'import' CLI commands for Excel scenario data

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    0d2233a View commit details
    Browse the repository at this point in the history

  20. Test Excel I/O CLI

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    3d0a6b9 View commit details
    Browse the repository at this point in the history

  21. Read CSV or Excel in utils.import_timeseries

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    ab636e3 View commit details
    Browse the repository at this point in the history

  22. Add missing comma in test_import_ts

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    e84922a View commit details
    Browse the repository at this point in the history

  23. Adjust test_scenario.test_set

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    f46f55c View commit details
    Browse the repository at this point in the history

  24. Specify exceptions raised by Backend.item_get_elements

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    ad9dd12 View commit details
    Browse the repository at this point in the history

  25. Adjust TestScenario.test_from_url

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    4fd571b View commit details
    Browse the repository at this point in the history

  26. Update release notes

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    d563601 View commit details
    Browse the repository at this point in the history

  27. Add 'file-io' documentation page

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    ac7ab5a View commit details
    Browse the repository at this point in the history

  28. Check type before len of key in Scenario.add_set

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    56ec0a2 View commit details
    Browse the repository at this point in the history

  29. Move utils.import_timeseries to backend.io.ts_read_file 

    - TimeSeries.read_file: new method.
- TimeSeries.add_timeseries: add a `year_lim` argument, so limiting
  data by year can be done even when not reading from file.
- core.to_iamc_template: rename to core.to_iamc_layout, update
  docstring, remove duplicate set computation.
- Simplify cli.import_timeseries.
- Update docs.
    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    11bb0e0 View commit details
    Browse the repository at this point in the history

  30. Remove unused import in utils

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    47278d7 View commit details
    Browse the repository at this point in the history

  31. Add IXMP_JDBC_EXCEPTION_VERBOSE global option & tests, use in CI

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    15ee2b5 View commit details
    Browse the repository at this point in the history

  32. Allow Windows line endings in test_verbose_exception

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    b26795c View commit details
    Browse the repository at this point in the history

  33. Raise ValueError from JDBCBackend.get

    @khaeru
    khaeru committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    660b9af View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. Correct Travis YAML syntax for matrix builds

    @khaeru
    khaeru committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    f24aa1e View commit details
    Browse the repository at this point in the history

  2. Update error handling and logging 

    - remove finally block in timeseries commit method (java)
- change input validation in setStatus method (java)
- fix commit in Scenario class (java)
- propagate exceptions from commit (java)
- upgrade pytest dependency
- add platform method to get current log level (remove changing log level in tests as it affects other tests log output)
- updated ixmp.jar (source diff iiasa/ixmp_source@1074219...923f5b9)
    @zikolach @khaeru
    zikolach authored and khaeru committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    fe37314 View commit details
    Browse the repository at this point in the history

  3. Sync pytest in ci/conda-requirements.txt with setup.py

    @khaeru
    khaeru committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    21ec585 View commit details
    Browse the repository at this point in the history

  4. Add cli.VersionType docstring

    @khaeru
    khaeru committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    50a3b4f View commit details
    Browse the repository at this point in the history

  5. Lint tests.backend.test_jdbc

    @khaeru
    khaeru committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    957a9d6 View commit details
    Browse the repository at this point in the history

  6. Parametrize test_log_level

    @khaeru
    khaeru committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    51f5068 View commit details
    Browse the repository at this point in the history

  7. Improve documentation of {read,write}_{excel,file}, get_log_level

    @khaeru
    khaeru committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    a0173f9 View commit details
    Browse the repository at this point in the history

  8. Lint tests.core.test_platform

    @khaeru
    khaeru committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    56e7b33 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. Increase coverage to 100% in ixmp.cli

    @khaeru
    khaeru committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    b94a3e8 View commit details
    Browse the repository at this point in the history

  2. Expand test_excel_io to cover unreadable items

    @khaeru
    khaeru committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    e6798c8 View commit details
    Browse the repository at this point in the history

  3. Test TimeSeries.read_file(…, lastyear=…)

    @khaeru
    khaeru committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    386f3fe View commit details
    Browse the repository at this point in the history