Repository navigation
Add Version.diff classification matching node-semver 7.7.2 #493
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
Open
masonjian
wants to merge
2
commits into
python-semver:master
Choose a base branch
from
masonjian:feat/version-diff-262
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+314
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| Added ``Version.diff(other)`` to classify valid version pairs like | ||
| node-semver 7.7.2: ``major``, ``minor``, ``patch``, ``premajor``, ``preminor``, | ||
| ``prepatch``, or ``prerelease``, including its prerelease-to-release rules. | ||
| Equal precedence returns ``None`` and build metadata is ignored. It accepts | ||
| ``Version``, ``str``, ``bytes``, ``dict``, ``tuple``, and ``list`` operands with | ||
| Python conversion errors. This classification does not choose a staging-branch | ||
| bump policy. |
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
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
|
tomschr marked this conversation as resolved.
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| # Adapted from node-semver v7.7.2 test/functions/diff.js: | ||
| # https://github.com/npm/node-semver/blob/v7.7.2/test/functions/diff.js | ||
| # The ISC License | ||
| # | ||
| # Copyright (c) Isaac Z. Schlueter and Contributors | ||
| # | ||
| # Permission to use, copy, modify, and/or distribute this software for any | ||
| # purpose with or without fee is hereby granted, provided that the above | ||
| # copyright notice and this permission notice appear in all copies. | ||
| # | ||
| # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
| # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
| # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
| # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
| # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR | ||
| # IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
|
|
||
| import pytest | ||
|
|
||
| from semver import Version | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "left,right,expected", | ||
| [ | ||
| ("1.2.3", "0.2.3", "major"), | ||
| ("0.2.3", "1.2.3", "major"), | ||
| ("1.4.5", "0.2.3", "major"), | ||
| ("1.2.3", "2.0.0-pre", "premajor"), | ||
| ("2.0.0-pre", "1.2.3", "premajor"), | ||
| ("1.2.3", "1.3.3", "minor"), | ||
| ("1.0.1", "1.1.0-pre", "preminor"), | ||
| ("1.2.3", "1.2.4", "patch"), | ||
| ("1.2.3", "1.2.4-pre", "prepatch"), | ||
| ("0.0.1", "0.0.1-pre", "patch"), | ||
| ("0.0.1", "0.0.1-pre-2", "patch"), | ||
| ("1.1.0", "1.1.0-pre", "minor"), | ||
| ("1.1.0-pre-1", "1.1.0-pre-2", "prerelease"), | ||
| ("1.0.0", "1.0.0", None), | ||
| ("1.0.0-1", "1.0.0-1", None), | ||
| ("0.0.2-1", "0.0.2", "patch"), | ||
| ("0.0.2-1", "0.0.3", "patch"), | ||
| ("0.0.2-1", "0.1.0", "minor"), | ||
| ("0.0.2-1", "1.0.0", "major"), | ||
| ("0.1.0-1", "0.1.0", "minor"), | ||
| ("1.0.0-1", "1.0.0", "major"), | ||
| ("1.0.0-1", "1.1.1", "major"), | ||
| ("1.0.0-1", "2.1.1", "major"), | ||
| ("1.0.1-1", "1.0.1", "patch"), | ||
| ("0.0.0-1", "0.0.0", "major"), | ||
| ("1.0.0-1", "2.0.0", "major"), | ||
| ("1.0.0-1", "2.0.0-1", "premajor"), | ||
| ("1.0.0-1", "1.1.0-1", "preminor"), | ||
| ("1.0.0-1", "1.0.1-1", "prepatch"), | ||
| ("1.7.2-1", "1.8.1", "minor"), | ||
| ("1.1.1-pre", "2.1.1-pre", "premajor"), | ||
| ("1.1.1-pre", "2.1.1", "major"), | ||
| ("1.2.3-1", "1.2.3", "patch"), | ||
| ("1.4.0-1", "2.3.5", "major"), | ||
| ("1.6.1-5", "1.7.2", "minor"), | ||
| ("2.0.0-1", "2.1.1", "major"), | ||
| ("1.0.0-alpha", "1.1.1", "major"), | ||
| ("1.0.1-rc.1", "1.0.1", "patch"), | ||
| ("1.2.3-alpha+one", "2.3.4-beta+two", "premajor"), | ||
| ("1.2.3-alpha+one", "1.3.4-beta+two", "preminor"), | ||
| ("1.2.3-alpha+one", "1.2.4-beta+two", "prepatch"), | ||
| ("1.2.3-alpha.2", "1.2.3-alpha.10", "prerelease"), | ||
| ("1.2.3-alpha.1", "1.2.3-alpha.1.1", "prerelease"), | ||
| ("1.2.3+one", "1.2.3+two", None), | ||
| ("1.2.3", "1.2.3+one", None), | ||
| ("1.2.3-alpha+one", "1.2.3-alpha+two", None), | ||
| ], | ||
| ) | ||
| def test_diff(left, right, expected): | ||
| left, right = Version.parse(left), Version.parse(right) | ||
| before = left.to_tuple(), right.to_tuple() | ||
| assert left.diff(right) == expected | ||
| assert right.diff(left) == expected | ||
| assert (left.to_tuple(), right.to_tuple()) == before | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "other", | ||
| [Version(2), "2.0.0", b"2.0.0", {"major": "2"}, (2,), [2, 0]], | ||
| ) | ||
| def test_diff_accepts_comparable(other): | ||
| assert Version(1).diff(other) == "major" | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "other", | ||
| [ | ||
| "1.2.3-rc.1+two", | ||
| b"1.2.3-rc.1+two", | ||
| {"major": 1, "minor": 2, "patch": 3, "prerelease": "rc.1", "build": "two"}, | ||
| (1, 2, 3, "rc.1", "two"), | ||
| [1, 2, 3, "rc.1", "two"], | ||
| ], | ||
| ) | ||
| def test_diff_converts_all_parts(other): | ||
| assert Version.parse("1.2.3-rc.1+one").diff(other) is None | ||
| assert Version(1, 2, 3).diff(other) == "patch" | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("other", [None, 1, 1.5, object(), {1, 2, 3}]) | ||
| def test_diff_rejects_unsupported_types(other): | ||
| with pytest.raises( | ||
| TypeError, match="Expected str, bytes, dict, tuple, list, or Version" | ||
| ): | ||
| Version(1).diff(other) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("other", ["bad", b"bad", "1.02.3", b"\xff"]) | ||
| def test_diff_rejects_invalid_strings(other): | ||
| with pytest.raises(ValueError): | ||
| Version(1).diff(other) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "other", | ||
| [{}, {"unknown": 1}, (1, 2, 3, 4, 5, 6), [], [None]], | ||
| ) | ||
| def test_diff_rejects_invalid_collection_shape(other): | ||
| with pytest.raises(TypeError): | ||
| Version(1).diff(other) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("other", [{"major": -1}, ("bad",), [1, -2]]) | ||
| def test_diff_rejects_invalid_collection_value(other): | ||
| with pytest.raises(ValueError): | ||
| Version(1).diff(other) | ||
|
|
||
|
|
||
| def test_diff_accepts_subclasses_without_reconstructing_instances(): | ||
| class DerivedVersion(Version): | ||
| def __init__(self, major, *, label): | ||
| super().__init__(major) | ||
| self.label = label | ||
|
|
||
| def compare(self, other): | ||
| raise AssertionError("diff must use SemVer precedence") | ||
|
|
||
| class SiblingVersion(Version): | ||
| pass | ||
|
|
||
| derived = DerivedVersion(1, label="custom") | ||
| for other in (Version(2), DerivedVersion(2, label="other"), SiblingVersion(2)): | ||
| assert derived.diff(other) == "major" | ||
| assert other.diff(derived) == "major" | ||
| assert derived.label == "custom" | ||
|
|
||
|
|
||
| def test_diff_uses_subclass_conversion_hooks(): | ||
| class DerivedVersion(Version): | ||
| @classmethod | ||
| def parse(cls, version, **kwargs): | ||
| return super().parse(version[1:], **kwargs) | ||
|
|
||
| assert DerivedVersion(1).diff("v2.0.0") == "major" | ||
| assert DerivedVersion(1).diff(b"v2.0.0") == "major" | ||
| assert DerivedVersion(1).diff({"major": 2}) == "major" | ||
| assert DerivedVersion(1).diff((2,)) == "major" | ||
| assert DerivedVersion(1).diff([2]) == "major" |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.