Merging LimnoTech contributions from devPy3 #5
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
update README.rst installation section to use environment.yml file
Updating environment.yml file to Pyhton 3.8 based on input from Bob's development stack.
Update environment.yml file to resovle OS specficity. Reduces the number of dependencies specfied to better allow conda to resolve package depencies for different operating systems.
aufdenkampe
added a commit
that referenced
this pull request
Apr 8, 2020
from @ptomasula previously committed to https://github.com/LimnoTech/HSPsquared/tree/devPy3-limno. See #5 for individual commits.
aufdenkampe
added a commit
that referenced
this pull request
Apr 8, 2020
These test and demo files were in https://github.com/respec/HSPsquared/tree/devPy3 and used in our workshop. Connected to PR #5.
Member
Author
|
I decided to merge in the important commits manually, as there were a lot of conflicts between the commits by @PaulDudaRESPEC to their https://github.com/respec/HSPsquared/tree/devPy3 branch versus the commits made directly by @rheaphy with his Python 3 update to https://github.com/respec/HSPsquared/tree/master. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Many of these commits are not worth moving, but I'm exploring a workflow where I reject certain commits.