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

Remove Tag attribute from MeasureSet #754

Merged
merged 7 commits into from
Jul 13, 2023
Merged

Remove Tag attribute from MeasureSet #754

merged 7 commits into from
Jul 13, 2023

Commits on Jul 12, 2023

  1. climada.entity.measure: remove Tag from MeasureSet

    @emanuel-schmid
    emanuel-schmid committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    71d5d4a View commit details
    Browse the repository at this point in the history

  2. test_entity: reestablish miinimal test for read_mat

    @emanuel-schmid
    emanuel-schmid committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    cd6025d View commit details
    Browse the repository at this point in the history

  3. climada.entity.measures.test: adapt to removed tag

    @emanuel-schmid
    emanuel-schmid committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    ca41cd9 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/develop' into feature/remove_tag… 

    …s_measureset

# Conflicts:
#	climada/entity/test/test_entity.py
    @emanuel-schmid
    emanuel-schmid committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    8e814d6 View commit details
    Browse the repository at this point in the history

  5. remove tag from tutorial, simplify pydoc

    @emanuel-schmid
    emanuel-schmid committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    7304c93 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Merge branch 'develop' into feature/remove_tags_measureset

    @peanutfun
    peanutfun committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    809d1d7 View commit details
    Browse the repository at this point in the history

  2. Fix Entity.__str__ and add test

    @peanutfun
    peanutfun committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    b96a3b8 View commit details
    Browse the repository at this point in the history