Make main the default branch (#175)

* Make main the default branch

* Configure main as the main branch in the CI

* Rename branch to main

* Rename master branch to main in the CI

* Remove mentions to master

* Fetch main

* Put lines back

* Assert if command has successfuly ran

* Remove echos from test workflow

.github/workflows/tests.yml

@@ -34,4 +34,6 @@ jobs:
           python -m pip install -r requirements.txt
           python setup.py install
       - name: Run tests for ${{ matrix.python-version }}
-        run: pytest -vvv
+        run: |
+          git branch -m main  # still master by default in GitHub Actions
+          pytest -vvv

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 ### Added
+- Make `main` the default parent branch (#148)
 - Drop support to Python 3.5 and 3.6, and add support to 3.9, 3.10, and 3.11
 
 ## [0.4.6] - 2020-12-17

README.md

@@ -19,8 +19,8 @@ Let's say you have the following output from `git status`:
 
     $ git status
 
-    On branch master
-    Your branch is ahead of 'origin/master' by 1 commit.
+    On branch main
+    Your branch is ahead of 'origin/main' by 1 commit.
       (use "git push" to publish your local commits)
 
     Untracked files:
@@ -65,7 +65,7 @@ pytest --picked --mode=branch
 
 pytest --picked --mode=unstaged  # default
 
-pytest --picked --mode=branch --parent-branch=main # if your parent branch differs from "master"
+pytest --picked --mode=branch --parent-branch=dev # if your parent branch differs from "main"
 ```
 
 ## Features

pytest_picked/modes.py

@@ -1,5 +1,6 @@
 import re
 import subprocess  # nosec
+import warnings
 from abc import ABC, abstractmethod
 
 
@@ -49,8 +50,9 @@ def parser(self, candidate):
 
 
 class Branch(Mode):
-    def __init__(self, test_file_convention, parent_branch="master"):
+    def __init__(self, test_file_convention, parent_branch="main"):
         super().__init__(test_file_convention)
+        warnings.warn("Now `main` is the default parent branch")
         self.parent_branch = parent_branch
 
     def command(self):

pytest_picked/plugin.py

@@ -31,9 +31,9 @@ def pytest_addoption(parser):
         "--parent-branch",
         action="store",
         dest="parent_branch",
-        default="master",
+        default="main",
         required=False,
-        help="The main branch of your repo (master, main, trunk, etc)",
+        help="The main branch of your repo (main, develop, trunk etc)",
     )
 
 

setup.py

@@ -11,7 +11,7 @@ def read(fname):
 
 setup(
     name="pytest-picked",
-    version="0.4.7",
+    version="0.5.0",
     author="Ana Paula Gomes",
     author_email="apgomes88@gmail.com",
     maintainer="Ana Paula Gomes",

tests/test_modes.py

@@ -20,9 +20,7 @@ def git_repository(testdir):
         assert testdir.run(*git_user).ret == 0
         assert testdir.run(*git_email).ret == 0
 
-    testdir.run(
-        "git", "checkout", "-b", "master"
-    ).ret  # TODO remove when making main the default branch
+    assert testdir.run("git", "checkout", "-b", "main").ret == 0
     assert testdir.run("git", "commit", "--allow-empty", "-m_").ret == 0
     yield gitroot
 
@@ -100,7 +98,7 @@ def test_should_return_command_that_list_all_changed_files(self):
             "diff",
             "--name-status",
             "--relative",
-            "master",
+            "main",
         ]
 
     def test_should_return_command_that_list_all_changed_files_for_different_branch(

tests/test_pytest_picked.py

@@ -251,7 +251,7 @@ def test_should_accept_different_parent_branch_param(testdir, tmpdir):
         output = b"M       test_flows.py\nA       test_serializers.py\n"
         subprocess_mock.return_value.stdout = output
 
-        result = testdir.runpytest("--picked", "--mode=branch", "--parent-branch=main")
+        result = testdir.runpytest("--picked", "--mode=branch", "--parent-branch=dev")
         testdir.makepyfile(
             ".py",
             test_flows="""