Skip to content

Merging #1377 back into master#1378

Closed
Iximiel wants to merge 17 commits intoplumed:masterfrom
Iximiel:merging/v2.10-python310backport
Closed

Merging #1377 back into master#1378
Iximiel wants to merge 17 commits intoplumed:masterfrom
Iximiel:merging/v2.10-python310backport

Conversation

@Iximiel
Copy link
Member

@Iximiel Iximiel commented Mar 10, 2026

Description

@carlocamilloni This resolves the merge conflicts created by #1377

Target release

I would like my code to appear in release v2.11

Type of contribution
  • changes to code or doc authored by PLUMED developers, or additions of code in the core or within the default modules
  • changes to a module not authored by you
  • new module contribution or edit of a module authored by you
Copyright
  • I agree to transfer the copyright of the code I have written to the PLUMED developers or to the author of the code I am modifying.
  • the module I added or modified contains a COPYRIGHT file with the correct license information. Code should be released under an open source license. I also used the command cd src && ./header.sh mymodulename in order to make sure the headers of the module are correct.
Tests
  • I added a new regtest or modified an existing regtest to validate my changes.
  • I verified that all regtests are passed successfully on GitHub Actions.

Iximiel and others added 17 commits January 14, 2026 15:23
Now <memory> is automatically included if the compiler is C++11 or more
capable, so that the c++11 capabilities do not produce a compilation
error even if __PLUMED_WRAPPER_CXX11 is not activated
Changed the order of the includes and when include <memory> in the wrapper
Now running make install after configuration does not skip the vim and json recipes.
Now install target depends on all
…med output

In the mkstemp documentation there is the following sentence:
> Unlike TemporaryFile(), the user of mkstemp() is responsible for
> deleting the temporary file when done with it.

So I decided to use the higher level routine to avoid putting a new file
in the tmp dir every time I run some test (or the user tries to create
a new input with the InputBuilder)
_guessplumedroot now deletes the temporary file used to store the plumed output
Overcoming the conflicts in merging 2.9 into 2.10
Backporting the CI and code modifications into 2.10 for python 3.10 compatibilities
@Iximiel Iximiel closed this Mar 11, 2026
@Iximiel Iximiel deleted the merging/v2.10-python310backport branch March 11, 2026 10:13
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.

5 participants