diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cb7594..dd555f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.24.0] - 2022-0514 +- rename the "master" branch of riscv-arch-test to "main" + ## [1.23.4] - 2022-02-24 - fixed doc dependency on mistune for successful RTD build diff --git a/riscof/__init__.py b/riscof/__init__.py index 9a65dea..a92aa25 100644 --- a/riscof/__init__.py +++ b/riscof/__init__.py @@ -4,4 +4,4 @@ __author__ = """InCore Semiconductors Pvt Ltd""" __email__ = 'info@incoresemi.com' -__version__ = '1.23.4' +__version__ = '1.24.0' diff --git a/riscof/arch_test.py b/riscof/arch_test.py index 20017be..8cff511 100644 --- a/riscof/arch_test.py +++ b/riscof/arch_test.py @@ -29,16 +29,16 @@ def get_version(path): success = True else: logger.debug("Repository is not the official RISCV Architectural Test suite or the \ -branch is not the master branch.") +branch is not the main branch.") return ver_dict,success -def update(path,branch='master'): +def update(path,branch='main'): version,is_repo = get_version(path) if is_repo: logger.debug("Current version of the repository: " + version['version']) logger.debug("Current commit hash of the repository: " + version['commit']) repo = git.Repo(path) - repo.git.pull('origin','master') + repo.git.pull('origin','main') latest_tag = (repo.tags)[-1] checkout_target = latest_tag if branch=='latest' else branch repo.git.checkout(checkout_target) @@ -48,7 +48,7 @@ def update(path,branch='master'): else: logger.info("Directory does not contain the riscv-arch-test repo.") -def clone(path,branch="master"): +def clone(path,branch="main"): logger.info("Clonning repository at "+str(path)) repo = git.Repo.clone_from(constants.https_url, path) latest_tag = (repo.tags)[-1] diff --git a/setup.cfg b/setup.cfg index 45feb34..c8ee5d8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.23.4 +current_version = 1.24.0 commit = True tag = True diff --git a/setup.py b/setup.py index 81a4e3e..b91926d 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ def read_requires(): test_requirements = [ ] setup(name="riscof", - version='1.23.4', + version='1.24.0', description="RISC-V Architectural Test Framework", long_description=readme + '\n\n', classifiers=[