Skip to content

ARROW-10369: [Dev] Fix archery release utility test cases #8506

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.

Sign up for GitHub

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

Closed
kszucs wants to merge 1 commit into from
Closed

ARROW-10369: [Dev] Fix archery release utility test cases #8506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ci/conda_env_archery.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@
# under the License.

click
gitpython
pygithub
ruamel.yaml
semver
5 changes: 2 additions & 3 deletions dev/archery/archery/release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ def __init__(self, user=None, password=None,

def project_version(self, version_string, project='ARROW'):
# query version from jira to populated with additional metadata
versions = self.project_versions(project)
# Version instances are comparable with strings
return versions[versions.index(version_string)]
versions = {str(v): v for v in self.project_versions(project)}
return versions[version_string]

def project_versions(self, project):
versions = []
Expand Down
24 changes: 12 additions & 12 deletions dev/archery/archery/tests/test_release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,43 +228,43 @@ def test_release_basics(fake_jira):
def test_previous_and_next_release(fake_jira):
r = Release.from_jira("3.0.0", jira=fake_jira)
assert isinstance(r.previous, MajorRelease)
assert r.previous.version == "2.0.0"
assert r.previous.version == Version("2.0.0")
with pytest.raises(ValueError, match="There is no upcoming release set"):
assert r.next

r = Release.from_jira("2.0.0", jira=fake_jira)
assert isinstance(r.previous, MajorRelease)
assert isinstance(r.next, MajorRelease)
assert r.previous.version == "1.0.0"
assert r.next.version == "3.0.0"
assert r.previous.version == Version("1.0.0")
assert r.next.version == Version("3.0.0")

r = Release.from_jira("1.1.0", jira=fake_jira)
assert isinstance(r.previous, MajorRelease)
assert isinstance(r.next, MajorRelease)
assert r.previous.version == "1.0.0"
assert r.next.version == "2.0.0"
assert r.previous.version == Version("1.0.0")
assert r.next.version == Version("2.0.0")

r = Release.from_jira("1.0.0", jira=fake_jira)
assert isinstance(r.next, MajorRelease)
assert isinstance(r.previous, MajorRelease)
assert r.previous.version == "0.17.0"
assert r.next.version == "2.0.0"
assert r.previous.version == Version("0.17.0")
assert r.next.version == Version("2.0.0")

r = Release.from_jira("0.17.0", jira=fake_jira)
assert isinstance(r.previous, MajorRelease)
assert r.previous.version == "0.16.0"
assert r.previous.version == Version("0.16.0")

r = Release.from_jira("0.15.2", jira=fake_jira)
assert isinstance(r.previous, PatchRelease)
assert isinstance(r.next, MajorRelease)
assert r.previous.version == "0.15.1"
assert r.next.version == "0.16.0"
assert r.previous.version == Version("0.15.1")
assert r.next.version == Version("0.16.0")

r = Release.from_jira("0.15.1", jira=fake_jira)
assert isinstance(r.previous, MajorRelease)
assert isinstance(r.next, PatchRelease)
assert r.previous.version == "0.15.0"
assert r.next.version == "0.15.2"
assert r.previous.version == Version("0.15.0")
assert r.next.version == Version("0.15.2")


def test_release_issues(fake_jira):
Expand Down