Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kdeldycke/mail-deduplicate
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.1.1
Choose a base ref
...
head repository: kdeldycke/mail-deduplicate
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v6.1.2
Choose a head ref
  • 8 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 25, 2021

  1. kick off the work for a 3.0.1 release

    @leggewie @kdeldycke
    leggewie authored and kdeldycke committed Jan 25, 2021

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 7274C13F73F665C8
    Learn about vigilant mode
    Copy the full SHA
    dac5959 View commit details

  2. deprecate the 3.x branch and issue a warning to upgrade to 6.x (fixes: … 

    …#172)
    @leggewie @kdeldycke
    leggewie authored and kdeldycke committed Jan 25, 2021
    Copy the full SHA
    75cdf79 View commit details

  3. cli.py: add a 5 second timer to make the deprecation warning more pro… 

    …minent
    @leggewie @kdeldycke
    leggewie authored and kdeldycke committed Jan 25, 2021
    Copy the full SHA
    a8a6068 View commit details

  4. Update changelog.

    @kdeldycke
    kdeldycke committed Jan 25, 2021
    Copy the full SHA
    40f9412 View commit details

Commits on Jan 26, 2021

  1. Post release version bump.

    @kdeldycke
    kdeldycke committed Jan 26, 2021
    Copy the full SHA
    d252b51 View commit details

  2. Merge branch 'v3' into develop 

    Reconcile v3 changelog with canonical develop branch.
    @kdeldycke
    kdeldycke committed Jan 26, 2021
    Copy the full SHA
    2620324 View commit details

  3. Add missing changelog.

    @kdeldycke
    kdeldycke committed Jan 26, 2021
    Copy the full SHA
    16bd5e8 View commit details

  4. Release v6.1.2.

    @kdeldycke
    kdeldycke committed Jan 26, 2021
    Copy the full SHA
    12e1997 View commit details
Showing with 16 additions and 3 deletions.
  1. +13 −0 changelog.rst
  2. +1 −1 mail_deduplicate/__init__.py
  3. +1 −1 pyproject.toml
  4. +1 −1 setup.cfg
13 changes: 13 additions & 0 deletions changelog.rst
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,12 @@ ChangeLog
=========


`6.1.2 (2021-01-26) <https://github.com/kdeldycke/mail-deduplicate/compare/v6.1.1...v6.1.2>`_
---------------------------------------------------------------------------------------------

* Reconcile ``v3`` branch with ``develop``.


`6.1.1 (2021-01-26) <https://github.com/kdeldycke/mail-deduplicate/compare/v6.1.0...v6.1.1>`_
---------------------------------------------------------------------------------------------

@@ -111,6 +117,13 @@ ChangeLog
* Run unittests in random to order to detect coupling.


`3.0.1 (2021-01-25) <https://github.com/kdeldycke/mail-deduplicate/compare/v3.0.0...v3.0.1>`_
---------------------------------------------------------------------------------------------

* Add explicit warning in CLI output to warn about 3.x branch deprecation.
Refs #180.


`3.0.0 (2020-09-03) <https://github.com/kdeldycke/maildir-deduplicate/compare/v2.2.0...v3.0.0>`_
------------------------------------------------------------------------------------------------

2 changes: 1 addition & 1 deletion mail_deduplicate/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
# Canonical name of the CLI.
CLI_NAME = "mdedup"

__version__ = "6.1.1"
__version__ = "6.1.2"


# Environment data.
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tool.poetry]
# Docs: https://python-poetry.org/docs/pyproject/
name = "mail-deduplicate"
version = "6.1.1"
version = "6.1.2"
description = "📧 CLI to deduplicate mails from mail boxes."
license = 'GPL-2.0-or-later'
authors = ["Kevin Deldycke <kevin@deldycke.com>"]
2 changes: 1 addition & 1 deletion setup.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://github.com/c4urself/bump2version#configuration-file
[bumpversion]
current_version = 6.1.1
current_version = 6.1.2
files = ./pyproject.toml ./mail_deduplicate/__init__.py ./changelog.rst
allow_dirty = True