Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3b78907fdbbf2f26ea89f4459901e59164a033b7 https://github.com/galaxyproject/galaxy/commit/3b78907fdbbf2f26ea89f4459901e... Author: Nicola Soranzo nicola.soranzo@tgac.ac.uk Date: 2017-02-07 (Tue, 07 Feb 2017)

Changed paths: M lib/galaxy/managers/deletable.py A lib/galaxy/model/migrate/versions/0134_hda_set_deleted_if_purged.py M test/api/test_history_contents.py M test/unit/managers/test_HDAManager.py

Log Message: ----------- Set 'deleted' to True when purging a history dataset association

Fix https://github.com/galaxyproject/galaxy/issues/3548

Add API and unit test cases. Add migration to fix misaligned databases.

Commit: b215ea1eed127e61421cccb8ff5ddb68963e28ae https://github.com/galaxyproject/galaxy/commit/b215ea1eed127e61421cccb8ff5dd... Author: Nicola Soranzo nicola.soranzo@earlham.ac.uk Date: 2017-02-08 (Wed, 08 Feb 2017)

Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M lib/galaxy/webapps/galaxy/api/histories.py M test/api/test_histories.py M test/unit/managers/test_HistoryManager.py

Log Message: ----------- Sync API history purge with hda implementation

Add API and unit test cases. Import order and Python3 fixes.

Commit: ed3062b41de47d77974bfae97bac21b2d9806432 https://github.com/galaxyproject/galaxy/commit/ed3062b41de47d77974bfae97bac2... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-02-08 (Wed, 08 Feb 2017)

Changed paths: M .ci/flake8_lint_include_list.txt M .ci/py3_sources.txt M lib/galaxy/managers/deletable.py A lib/galaxy/model/migrate/versions/0134_hda_set_deleted_if_purged.py M lib/galaxy/webapps/galaxy/api/histories.py M test/api/test_histories.py M test/api/test_history_contents.py M test/unit/managers/test_HDAManager.py M test/unit/managers/test_HistoryManager.py

Log Message: ----------- Merge pull request #3572 from nsoranzo/fix_3548

Set 'deleted' to True when purging a history dataset association

Compare: https://github.com/galaxyproject/galaxy/compare/3b3bfad8e0af...ed3062b41de4