Skip to content

Commit

Permalink
Merge pull request #45 from riscv-software-src/rename-master-to-main
Browse files Browse the repository at this point in the history
rename the "master" branch of riscv-arch-test to "main"
  • Loading branch information
pawks authored May 14, 2022
2 parents e78f8da + f5dc916 commit 69b57e1
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion riscof/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

__author__ = """InCore Semiconductors Pvt Ltd"""
__email__ = '[email protected]'
__version__ = '1.23.4'
__version__ = '1.24.0'
8 changes: 4 additions & 4 deletions riscof/arch_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.23.4
current_version = 1.24.0
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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=[
Expand Down

0 comments on commit 69b57e1

Please sign in to comment.