diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f684e925a..d011a250a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,9 +1,9 @@ name: Build on: push: - branches: [master, 'stable/*'] + branches: [main, 'stable/*'] pull_request: - branches: [master, 'stable/*'] + branches: [main, 'stable/*'] jobs: standalone: runs-on: ${{ matrix.os }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 628ce5213..3335b4be1 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,9 +1,9 @@ name: Docs and Tutorial on: push: - branches: [master, 'stable/*'] + branches: [main, 'stable/*'] pull_request: - branches: [master, 'stable/*'] + branches: [main, 'stable/*'] jobs: docs: runs-on: ubuntu-latest diff --git a/.github/workflows/tests_linux.yml b/.github/workflows/tests_linux.yml index b76043bf6..64e356d5d 100644 --- a/.github/workflows/tests_linux.yml +++ b/.github/workflows/tests_linux.yml @@ -1,9 +1,9 @@ name: Tests Linux on: push: - branches: [master, 'stable/*'] + branches: [main, 'stable/*'] pull_request: - branches: [master, 'stable/*'] + branches: [main, 'stable/*'] jobs: lint: runs-on: ubuntu-latest diff --git a/.github/workflows/tests_mac.yml b/.github/workflows/tests_mac.yml index 21cc092d1..d62ea54bb 100644 --- a/.github/workflows/tests_mac.yml +++ b/.github/workflows/tests_mac.yml @@ -1,9 +1,9 @@ name: Tests MacOS on: push: - branches: [master, 'stable/*'] + branches: [main, 'stable/*'] pull_request: - branches: [master, 'stable/*'] + branches: [main, 'stable/*'] jobs: lint: runs-on: macOS-latest diff --git a/.github/workflows/tests_windows.yml b/.github/workflows/tests_windows.yml index b8816e827..e414d3cb4 100644 --- a/.github/workflows/tests_windows.yml +++ b/.github/workflows/tests_windows.yml @@ -1,9 +1,9 @@ name: Tests Windows on: push: - branches: [master, 'stable/*'] + branches: [main, 'stable/*'] pull_request: - branches: [master, 'stable/*'] + branches: [main, 'stable/*'] jobs: lint: runs-on: windows-latest diff --git a/BENCHMARKING.md b/BENCHMARKING.md index 83a844e35..10bf9232f 100644 --- a/BENCHMARKING.md +++ b/BENCHMARKING.md @@ -42,7 +42,7 @@ After the completion of the tests, you will see the results with a format simila · Creating environments · Discovering benchmarks · Running 3 total benchmarks (1 commit * 1 environment * 3 benchmarks) -[ 0.00%] · For qiskit-aer commit 8b4f4de1 : +[ 0.00%] · For qiskit-aer commit 8b4f4de1
: [ 0.00%] ·· Benchmarking conda-py3.7 [ 16.67%] ··· Running (quantum_volume_benchmarks.QuantumVolumeTimeSuite.time_quantum_volume--).. [ 50.00%] ··· Running (simple_benchmarks.SimpleU3TimeSuite.time_simple_u3--). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b3b71e5ea..8ff064c40 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -196,11 +196,11 @@ previous version in the release notes. ### Branches -* `master`: +* `main`: -The master branch is used for development of the next version of qiskit-aer. +The main branch is used for development of the next version of qiskit-aer. It will be updated frequently and should not be considered stable. The API -can and will change on master as we introduce and refine new features. +can and will change on main as we introduce and refine new features. * `stable/*` branches: Branches under `stable/*` are used to maintain released versions of qiskit-aer. @@ -214,13 +214,13 @@ merged to it are bugfixes. When it is time to release a new minor version of qiskit-aer, we will: 1. Create a new tag with the version number and push it to github -2. Change the `master` version to the next release version. +2. Change the `main` version to the next release version. The release automation processes will be triggered by the new tag and perform the following steps: 1. Create a stable branch for the new minor version from the release tag - on the `master` branch + on the `main` branch 2. Build and upload binary wheels to pypi 3. Create a GitHub release page with a generated changelog 4. Generate a PR on the meta-repository to bump the Aer version and diff --git a/qiskit/providers/aer/version.py b/qiskit/providers/aer/version.py index d667d22cd..237d02af7 100644 --- a/qiskit/providers/aer/version.py +++ b/qiskit/providers/aer/version.py @@ -42,7 +42,7 @@ def _minimal_ext_cmd(cmd): def git_version(): """Get the current git head sha1.""" - # Determine if we're at master + # Determine if we're at main try: out = _minimal_ext_cmd(['git', 'rev-parse', 'HEAD']) git_revision = out.strip().decode('ascii') diff --git a/test/asv.linux.conf.json b/test/asv.linux.conf.json index 19a372418..c0d750073 100644 --- a/test/asv.linux.conf.json +++ b/test/asv.linux.conf.json @@ -51,9 +51,9 @@ "python setup.py bdist_wheel --dist-dir={build_cache_dir} -- -DCMAKE_CXX_COMPILER=g++ -- -j" ], - // List of branches to benchmark. If not provided, defaults to "master" + // List of branches to benchmark. If not provided, defaults to "main" // (for git) or "default" (for mercurial). - // "branches": ["master"], // for git + // "branches": ["main"], // for git // "branches": ["default"], // for mercurial // The DVCS being used. If not set, it will be automatically diff --git a/test/asv.linux.cuda.conf.json b/test/asv.linux.cuda.conf.json index bc0b826e7..d034764dc 100644 --- a/test/asv.linux.cuda.conf.json +++ b/test/asv.linux.cuda.conf.json @@ -51,9 +51,9 @@ "python setup.py bdist_wheel --dist-dir={build_cache_dir} -- -DCMAKE_CXX_COMPILER=g++ -DAER_THRUST_BACKEND=CUDA -- -j" ], - // List of branches to benchmark. If not provided, defaults to "master" + // List of branches to benchmark. If not provided, defaults to "main" // (for git) or "default" (for mercurial). - // "branches": ["master"], // for git + // "branches": ["main"], // for git // "branches": ["default"], // for mercurial // The DVCS being used. If not set, it will be automatically diff --git a/test/terra/common.py b/test/terra/common.py index 5282a42e7..e4c996d49 100644 --- a/test/terra/common.py +++ b/test/terra/common.py @@ -334,7 +334,7 @@ def _is_ci_fork_pull_request(): Returns: bool: True if the tests are executed inside a CI tool, and the changes - are not against the "master" branch. + are not against the "main" branch. """ if os.getenv('TRAVIS'): # Using Travis CI.