Skip to content

Conversation

@aufdenkampe
Copy link
Collaborator

@aufdenkampe aufdenkampe commented Apr 19, 2020

@rheaphy, it seems that we might need to park all the in-development model modules from commit LimnoTech@989a096 into a feature branch, so that we use the develop branch to first work on our other priorities to merge into master when complete.

So this PR is part of creating that structure, so that we can use a Feature Branch workflow similar to:
image

I created this develop-WaterQuality from @rheaphy's Development branch, and this PR merges in all the commits that @rheaphy since made to master.

I'm thinking that we might use the develop branch to work on these first set of tasks in our Collaborative Work Plan:

  • Expand testing system
  • Update demos/tutorial notebooks to py3
  • Issue first py3 release?

Meanwhile, we might use this develop-WaterQuality branch to work on these development objectives, perhaps even in parallel.

  • Share water quality Python code chunks from Fortran
  • Develop a WQ module process
  • Start working on WQ modules

We'll continue to merge into all updates from develop or master into this develop-WaterQuality.

cc: @PaulDudaRESPEC, @steveskrip, @ptomasula

aufdenkampe and others added 8 commits April 8, 2020 09:28
Following desire to keep the target use case in line with the current version of the Anaconda distribution, which currently defaults to Python 3.7.
Also updated ReadMe to restore barebones descriptions of folders.
These test and demo files were in https://github.com/respec/HSPsquared/tree/devPy3 and used in our workshop. Connected to PR #5.
Create test directory; restore test10 & demos 2-3; add Conda install file & instructions
Made HSP2 and HSP2 tools into packages.  Minor bugfix. Added timeseries summary table to the HDF5 file.
@aufdenkampe aufdenkampe merged commit ac9e539 into develop-WaterQuality Apr 19, 2020
PaulDudaRESPEC pushed a commit that referenced this pull request Jan 11, 2023
PaulDudaRESPEC pushed a commit that referenced this pull request Mar 12, 2025
Create `develop-WaterQuality` for work on non-hydrolic modules
PaulDudaRESPEC pushed a commit that referenced this pull request Mar 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants