Skip to content

Commit

Permalink
bugfix release 0.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
geritwagner committed Apr 5, 2023
1 parent 639fe90 commit de2b48f
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 14 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0).

### Fixed


## [0.8.2] - 2023-04-05

### Fixed

- Fix InvalidGitRepositoryError (raised upon status in empty directories)

## [0.8.1] - 2023-04-04

### Changed
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ authors:
given-names: "Julian"
orcid: "https://orcid.org/0000-0003-2682-8036"
title: "CoLRev: An open-source environment for collaborative reviews"
version: 0.8.1
version: 0.8.2
date-released: 2023-03-26
url: "https://github.com/CoLRev-Environment/colrev"
26 changes: 15 additions & 11 deletions colrev/ops/upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ def main(self) -> None:
settings_version_str = settings["project"]["colrev_version"]

settings_version = CoLRevVersion(settings_version_str)
# Start with the first step if the version is older:
if settings_version < CoLRevVersion("0.7.0"):
settings_version = CoLRevVersion("0.7.0")
installed_colrev_version = CoLRevVersion(version("colrev"))

if installed_colrev_version == settings_version:
return

migration_scripts: typing.List[typing.Dict[str, typing.Any]] = [
{
Expand All @@ -103,12 +110,9 @@ def main(self) -> None:
},
]

if settings_version == migration_scripts[-1]["version"]:
return

# Start with the first step if the version is older:
if settings_version not in [x["version"] for x in migration_scripts]:
settings_version = CoLRevVersion("0.7.0")
# Note: we should always update the colrev_version in settings.json because the
# checker.__check_software requires the settings version and
# the installed version to be identical

# skipping_versions_before_settings_version = True
run_migration = False
Expand All @@ -132,16 +136,16 @@ def main(self) -> None:
self.__print_release_notes(selected_version=migrator["version"])

settings = self.__load_settings_dict()
settings["project"]["colrev_version"] = str(version("colrev"))
settings["project"]["colrev_version"] = str(installed_colrev_version)
self.__save_settings(settings)

if self.repo.is_dirty():
msg = str(migrator["version"])
msg = f"Upgrade to CoLRev {installed_colrev_version}"
if not migrator["released"]:
msg += " (pre-release)"
self.repo.index.commit(
msg,
skip_hooks=True,
review_manager = colrev.review_manager.ReviewManager()
review_manager.create_commit(
msg=msg,
)

def __print_release_notes(self, *, selected_version: CoLRevVersion) -> None:
Expand Down
3 changes: 3 additions & 0 deletions colrev/review_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,9 @@ def in_ci_environment(
return any("true" == os.getenv(x) for x in identifier_list)


# pylint: disable=redefined-outer-name
# pylint: disable=import-outside-toplevel
# pylint: disable=too-many-arguments
def get_init_operation(
review_type: str,
example: bool = False,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "colrev"
version = "0.8.1"
version = "0.8.2"
description = "CoLRev: An open-source environment for collaborative reviews"
authors = ["Gerit Wagner <gerit.wagner@hec.ca>", "Julian Prester <julian.prester@sydney.edu.au>"]
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion tests/2_ops/ops_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ def test_data(review_manager: colrev.review_manager.ReviewManager) -> None:
def test_checks(review_manager: colrev.review_manager.ReviewManager) -> None:
checker = colrev.checker.Checker(review_manager=review_manager)

expected = ["0.8.1", "0.8.1"]
expected = ["0.8.2", "0.8.2"]
actual = checker.get_colrev_versions()
assert expected == actual

Expand Down

0 comments on commit de2b48f

Please sign in to comment.