Resolve merge conflicts for v1.4.0 release #833
Closed
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
* [MNT] update to release * [MNT] update to release * [MNT] single readme file * [MNT] typo * Apply suggestions from code review Co-authored-by: Pierre Guetschel <25532709+PierreGtch@users.noreply.github.com> Signed-off-by: Bru <b.aristimunha@gmail.com> * [MNT] version control * Single readme and contributing webpage * [pre-commit.ci] auto fixes from pre-commit.com hooks * removing docker, no one is using. * removing docker, no one is using. * removing poetry * external example * Hard fix * skipped test to release * V1.2.0 (#713) * [MNT] Sync v1.2.0 (#712) * develop into master v1.1.1 (#645) * Fix workflow cache (#632) * Copy workflow changes from PR #584 * Update whats_new.rst * Remove "always deploy" used for testing * Restore change to pytest instead of unittest * Use mne data cache in tests too * Remove duplicate restore cache (#634) * Fix example Hinss2021 (#636) * Dataset summary in CSV and leaderboard links (#635) * Add summary tables as csv * Change BaseDataset to include the dataset's summary table in the docstring * Try update summary table in doc * Add test for dataset summary table * Fix future annotations * Prepare summary tables before doc * Make build dir if not exist * Add rstate table * Replace tables with CSVs in doc * Add PapersWithCOde column * Fix initial white space * Fix formatting of ints * Remove tables from docstrings * Add missing DemonsP300 row * Update whats_new.rst * Remove Shin2017B leaderboard * Move PWC link outside of docstring table * Add Liu2024 Dataset (#619) * including Liu2024 Dataset * [pre-commit.ci] auto fixes from pre-commit.com hooks * Function data_path * [pre-commit.ci] auto fixes from pre-commit.com hooks * data_infos and get_single_subject_data functions * [pre-commit.ci] auto fixes from pre-commit.com hooks * Data Description * [pre-commit.ci] auto fixes from pre-commit.com hooks * updating get_single_subject fct and data_path & adding encoding fct * [pre-commit.ci] auto fixes from pre-commit.com hooks * Finishing the code * [pre-commit.ci] auto fixes from pre-commit.com hooks * updating docstrings for data_path * Updating dataset_summary and updating the get_single_subject fct to handle the case of existing file in path_electrodes * adapting the return of get_single_subject_data fct * [pre-commit.ci] auto fixes from pre-commit.com hooks * Adding dataset description and preload = True when reading the data in the get_single_subject fct * fix: codespell * fix: changing to static method the encoding * repushing and resolving pre-commit conflicts * [pre-commit.ci] auto fixes from pre-commit.com hooks * fix: changing the mapping * fix: changing the unmatching between the trigger and the events from the csv * ehn: using pylint to improve the code (remove not used variables, and change the module); * modifying the python version in the pre-commit file * adding description to enhancements * adjusting the encoding * adjusting comments and dataset description * solving channels types and names issues & correcting encoding * Correcting the number of trials per class and the total trials * Correcting data description * Adding the possibility to exclude/include break and instructions events * Correcting code to include/exclude instr and break events * Remove table from docstring Signed-off-by: PierreGtch <25532709+PierreGtch@users.noreply.github.com> * Add CSV row --------- Signed-off-by: PierreGtch <25532709+PierreGtch@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: bruAristimunha <a.bruno@aluno.ufabc.edu.br> Co-authored-by: PierreGtch <25532709+PierreGtch@users.noreply.github.com> Co-authored-by: Pierre Guetschel <pierre.guetschel@donders.ru.nl> * Add scripts to publish results on PaperWithCode (#561) * Add scripts to publish results on paperwithcode * Create tasks manually instead (API error 403 forbidden) * Try to create the evaluation first and other things, not working... * Update whats_new.rst * Fix example from API's README; still results in a "403 Forbidden" * Fix task_id * Allow passing multiple results files * Save commands used as comments * Add comment --------- Signed-off-by: PierreGtch <25532709+PierreGtch@users.noreply.github.com> Signed-off-by: Bru <a.bruno@aluno.ufabc.edu.br> Co-authored-by: Bru <a.bruno@aluno.ufabc.edu.br> * [pre-commit.ci] pre-commit autoupdate (#631) * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/pre-commit/pre-commit-hooks: v4.5.0 → v4.6.0](pre-commit/pre-commit-hooks@v4.5.0...v4.6.0) - [github.com/psf/black: 24.3.0 → 24.4.2](psf/black@24.3.0...24.4.2) - [github.com/asottile/blacken-docs: 1.16.0 → 1.18.0](adamchainz/blacken-docs@1.16.0...1.18.0) - [github.com/PyCQA/flake8: 7.0.0 → 7.1.0](PyCQA/flake8@7.0.0...7.1.0) - [github.com/astral-sh/ruff-pre-commit: v0.3.5 → v0.5.0](astral-sh/ruff-pre-commit@v0.3.5...v0.5.0) - [github.com/codespell-project/codespell: v2.2.6 → v2.3.0](codespell-project/codespell@v2.2.6...v2.3.0) * FIX: including new word * including --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Bru <a.bruno@aluno.ufabc.edu.br> * Optuna GridSearch (#630) * Optuna * [pre-commit.ci] auto fixes from pre-commit.com hooks * Optuna - Categorical Distibution * [pre-commit.ci] auto fixes from pre-commit.com hooks * Add optuna to dependency and regenerate poetry * Add optuna to dependency and regenerate poetry * Add optuna to dependency and regenerate poetry * Add test on within Session * [pre-commit.ci] auto fixes from pre-commit.com hooks * Add test on within Session * Add test on within Session * ehn: common function with dict * ehn: moving function to util * fix: correcting the what news file. * Add test benchmark and raise an issue if the conversion didn't worked and exposed time_out parameter * [pre-commit.ci] auto fixes from pre-commit.com hooks * FIX: italian to eng * EHN: making optuna optional * FIX: fixing the workflow files * FIX: changing the optuna file * FIX: including optuna for the windows --------- Signed-off-by: Bru <a.bruno@aluno.ufabc.edu.br> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: bruAristimunha <a.bruno@aluno.ufabc.edu.br> * correct name (#642) * V1.1.1 (#644) * release 1.1.1 * increase the version * increase the version * removing the poetry.lock * increase version * changing the CITATION.cff * upload versino for artifact * pylock -> pyproject.toml --------- Signed-off-by: PierreGtch <25532709+PierreGtch@users.noreply.github.com> Signed-off-by: Bru <a.bruno@aluno.ufabc.edu.br> Co-authored-by: PierreGtch <25532709+PierreGtch@users.noreply.github.com> Co-authored-by: Taha Habib <95372659+tahatt13@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Pierre Guetschel <pierre.guetschel@donders.ru.nl> Co-authored-by: Igor Carrara <94047258+carraraig@users.noreply.github.com> Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com> * V1.2.0 (#708) * [MNT] update to release * [MNT] update to release * [MNT] single readme file * [MNT] typo * Apply suggestions from code review Co-authored-by: Pierre Guetschel <25532709+PierreGtch@users.noreply.github.com> Signed-off-by: Bru <b.aristimunha@gmail.com> * [MNT] version control * Single readme and contributing webpage * [pre-commit.ci] auto fixes from pre-commit.com hooks * removing docker, no one is using. * removing docker, no one is using. * removing poetry * external example --------- Signed-off-by: Bru <b.aristimunha@gmail.com> Signed-off-by: Bru <a.bruno@aluno.ufabc.edu.br> Co-authored-by: Pierre Guetschel <25532709+PierreGtch@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Hard fix * skipped test to release * fixing issue with master * fixing issue with master part 2 --------- Signed-off-by: PierreGtch <25532709+PierreGtch@users.noreply.github.com> Signed-off-by: Bru <a.bruno@aluno.ufabc.edu.br> Signed-off-by: Bru <b.aristimunha@gmail.com> Co-authored-by: PierreGtch <25532709+PierreGtch@users.noreply.github.com> Co-authored-by: Taha Habib <95372659+tahatt13@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Pierre Guetschel <pierre.guetschel@donders.ru.nl> Co-authored-by: Igor Carrara <94047258+carraraig@users.noreply.github.com> Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com> * Solving the tdlda situation * renaming --------- Signed-off-by: PierreGtch <25532709+PierreGtch@users.noreply.github.com> Signed-off-by: Bru <a.bruno@aluno.ufabc.edu.br> Signed-off-by: Bru <b.aristimunha@gmail.com> Co-authored-by: PierreGtch <25532709+PierreGtch@users.noreply.github.com> Co-authored-by: Taha Habib <95372659+tahatt13@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Pierre Guetschel <pierre.guetschel@donders.ru.nl> Co-authored-by: Igor Carrara <94047258+carraraig@users.noreply.github.com> Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com> --------- Signed-off-by: Bru <b.aristimunha@gmail.com> Signed-off-by: Bru <a.bruno@aluno.ufabc.edu.br> Signed-off-by: PierreGtch <25532709+PierreGtch@users.noreply.github.com> Co-authored-by: Pierre Guetschel <25532709+PierreGtch@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Taha Habib <95372659+tahatt13@users.noreply.github.com> Co-authored-by: Pierre Guetschel <pierre.guetschel@donders.ru.nl> Co-authored-by: Igor Carrara <94047258+carraraig@users.noreply.github.com> Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com>
Closed
Resolved conflicts: - pyproject.toml: kept v1.4.0 and develop dependencies - examples: kept learning_curve directory location
Copilot
AI
changed the title
[WIP] Fix merge conflict in pyproject.toml
Resolve merge conflicts for v1.4.0 release
Nov 7, 2025
Copilot finished work on behalf of
PierreGtch
November 7, 2025 15:38
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.
Merged
masterinto the release branch to resolve conflicts that would prevent merging intomaster.Conflicts Resolved
pyproject.toml: Kept v1.4.0 version and dependency updates from develop:
tensorflow,keras,scikeras,libclang,tdldamne-features,snowballstemmer,myst-parserpytest-xdist>=3.10>=2.0^0.9examples/: Kept
learning_curve/directory location for renamed example fileThe PR can now merge cleanly into
master.✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.