Merge branch 'main' (0.1.0-beta.1) + release/0.1.1 into develop #30
Conversation
This file contains 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
(cherry picked from commit 0816e6b)
# Conflicts: # environments/py-3.10-linux-64-dev.conda.lock.yml # environments/py-3.10-linux-64.conda.lock.yml # environments/py-3.10-win-64-dev.conda.lock.yml # environments/py-3.10-win-64.conda.lock.yml # py-3.10.conda-lock.yml # pyproject.toml (cherry picked from commit 0c12353)
# Conflicts: # environments/py-3.10-linux-64-dev.conda.lock.yml # environments/py-3.10-linux-64.conda.lock.yml # environments/py-3.10-win-64-dev.conda.lock.yml # environments/py-3.10-win-64.conda.lock.yml # py-3.10.conda-lock.yml
Change target
# Conflicts: # devtools/add_url_tag_sha256.py # devtools/rename_my_app.py # devtools/run_conda_lock.py # tests/assets_path_test.py
# Conflicts: # plate_simulation/params.py # plate_simulation/point_simulations/__init__.py
GEOPY-1554: package for Orano
for more information, see https://pre-commit.ci
GEOPY-1563: plate-simulation: add license terms and list of 3rd party
Co-authored-by: Sébastien Hensgen <[email protected]>
plate-simulation v0.1.0-beta.1
# Conflicts: # environments/py-3.10-linux-64-dev.conda.lock.yml # environments/py-3.10-linux-64.conda.lock.yml # environments/py-3.10-win-64-dev.conda.lock.yml # environments/py-3.10-win-64.conda.lock.yml # plate_simulation/simulations/__init__.py # py-3.10.conda-lock.yml # pyproject.toml # tests/runtest/driver_test.py
and fix version of dependencies
# Conflicts: # environments/py-3.10-linux-64-dev.conda.lock.yml # environments/py-3.10-linux-64.conda.lock.yml # environments/py-3.10-win-64-dev.conda.lock.yml # environments/py-3.10-win-64.conda.lock.yml # plate_simulation/simulations/__init__.py # py-3.10.conda-lock.yml # pyproject.toml # tests/runtest/driver_test.py
for more information, see https://pre-commit.ci
sebhmg
changed the title
# Conflicts: # devtools/check-copyright.py # devtools/git_message_hook.py
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #30 +/- ##
==========================================
Coverage ? 92.09%
==========================================
Files ? 8
Lines ? 405
Branches ? 35
==========================================
Hits ? 373
Misses ? 18
Partials ? 14
|
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.
No description provided.