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.

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

Change input format. #35

Merged
merged 1 commit into from
Jul 23, 2015
Merged

Change input format. #35

merged 1 commit into from
Jul 23, 2015

Conversation

jamesmcclain
Copy link
Member

The modification types "bmp" and "reclassification" have been unified into a single type: "change".

For a modification, the word "change" is given as a key with an associated value which is a string of the form "soil:landuse:bmp". Any missing items (for example, soil and landuse when a BMP is being represented) can simply be left blank (for example, "::green_roof").

This is in service of WikiWatershed/model-my-watershed#585

@@ -13,7 +13,7 @@

setup(
name='tr55',
version='0.1.0.dev2',
version='0.1.0.dev3',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't include the version changes here or in the changlog. Let's add the new functionality and do a separate release and commit when we're ready. Also, we've dropped the dev* suffix. Since this has breaking changes, we should release it as 0.2.0 when we do.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay.

@mmcfarland
Copy link
Contributor

Tests pass & this looks good to me, 👍

@jamesmcclain
Copy link
Member Author

Okay, I would like to add a couple of additional tests, then I will squash and merge.

The modification types "bmp" and "reclassification" have been unified
into a single type: "change".

For a modification, the word "change" is given as a key with an
associated value which is a string of the form "soil:landuse:bmp". Any
missing items (for example, soil and landuse when a BMP is being
represented) can simply be left blank (for example, "::green_roof").

This is in service of WikiWatershed/model-my-watershed#585
jamesmcclain pushed a commit that referenced this pull request Jul 23, 2015
@jamesmcclain jamesmcclain merged commit fd4da43 into WikiWatershed:develop Jul 23, 2015
@hectcastro
Copy link
Contributor

Do we want to cut a new release of this now?

@jamesmcclain
Copy link
Member Author

I have made all of the changes that I need/want for the Geotrellis integration. We do still have an open card related to disquiet amongst some reviewers over the data used for the mini-app: that could require another change to this code.

@hectcastro
Copy link
Contributor

Is that in this sprint or further out? No harm in cutting multiple releases if we want to pin something in the main MMW project to a real release vs. a Git branch.

@jamesmcclain
Copy link
Member Author

I think the card is in the "in progress" column. I have no problem with a release, but perhaps @mmcfarland should weigh in.

@jamesmcclain jamesmcclain added the + label Jul 29, 2015
@jamesmcclain jamesmcclain deleted the feature/change-input-format branch October 6, 2015 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants