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

Release/v8.7.0 #112

Merged
merged 108 commits into from
May 28, 2024
Merged

Release/v8.7.0 #112

merged 108 commits into from
May 28, 2024

Conversation

berthetclement
Copy link
Collaborator

No description provided.

BERTHET Clement Ext and others added 30 commits April 20, 2023 15:12
Merge branch 'master' of https://github.com/rte-antares-rpackage/antaresEditObject into dev_86

# Conflicts:
#	DESCRIPTION
#	NEWS.md
Merge branch 'master' of https://github.com/rte-antares-rpackage/antaresEditObject into dev_86

# Conflicts:
#	DESCRIPTION
up version package + news.md

# Conflicts:
#	NEWS.md
#	R/scenarioBuilder.R
#	man/scenario-builder.Rd
#	tests/testthat/helper_init.R
#	tests/testthat/test-scenarioBuilder.R
…y_test_integration

Release/v8.7.0 study test integration
Merge branch 'master' of https://github.com/rte-antares-rpackage/antaresEditObject into release/v8.7.0

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	tests/testthat/test-writeInputTS.R
BERTHET Clement (Externe) and others added 24 commits April 12, 2024 15:30
… weight + offset

fix regression on value when NULL
Merge branch 'develop' of https://github.com/rte-antares-rpackage/antaresEditObject into release/v8.7.0

# Conflicts:
#	R/scenarioBuilder.R
#	tests/testthat/test-scenarioBuilder.R
Merge branch 'develop' of https://github.com/rte-antares-rpackage/antaresEditObject into release/v8.7.0

# Conflicts:
#	R/scenarioBuilder.R
#	man/scenario-builder.Rd
#	tests/testthat/test-scenarioBuilder.R
Merge branch 'develop' of https://github.com/rte-antares-rpackage/antaresEditObject into release/v8.7.0

# Conflicts:
#	tests/testthat/test-createPSP.R
Merge branch 'develop' of https://github.com/rte-antares-rpackage/antaresEditObject into release/v8.7.0

# Conflicts:
#	R/scenarioBuilder.R
#	man/scenario-builder.Rd
Merge branch 'develop' of https://github.com/rte-antares-rpackage/antaresEditObject into release/v8.7.0

# Conflicts:
#	DESCRIPTION
#	NEWS.md
…eck format of param coefficients and reforge it to API mode
Merge branch 'develop' of https://github.com/rte-antares-rpackage/antaresEditObject into release/v8.7.0

# Conflicts:
#	DESCRIPTION
#	NEWS.md
…esRead)

Merge branch 'develop' of https://github.com/rte-antares-rpackage/antaresEditObject into release/v8.7.0

# Conflicts:
#	tests/testthat/helper_init.R
#	tests/testthat/test-createCluster.R
#	tests/testthat/test-createClusterST.R
#	tests/testthat/test-createDSR.R
#	tests/testthat/test-createPSP.R
#	tests/testthat/test-createStudy.R
#	tests/testthat/test-editCluster.R
#	tests/testthat/test-editClusterST.R
#	tests/testthat/test-editLink.R
#	tests/testthat/test-updateBindingConstraint.R
#	tests/testthat/test-writeHydroValues.R
#	tests/testthat/test-writeInputTS.R
Copy link
Collaborator

@vargastat vargastat left a comment

Choose a reason for hiding this comment

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

ready for merge into develop

@berthetclement berthetclement merged commit 7c5da69 into develop May 28, 2024
6 checks passed
@berthetclement berthetclement deleted the release/v8.7.0 branch May 28, 2024 13:17
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.

4 participants