diff --git a/.editorconfig b/.editorconfig index 873470a..bc1a4e7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -17,3 +17,6 @@ trim_trailing_whitespace = false [*.html] trim_trailing_whitespace = false + +[*.py] +indent_size = 4 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2282331..810008d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.10 uses: actions/setup-python@v4 with: diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a230a78 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.venv/ +__pycache__/ diff --git a/tests/helper.py b/tests/helper.py index aec6cbc..66ffa81 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -18,7 +18,7 @@ class TempRepository: repo_work_dir = os.path.join(self._system_tmpdir, repo_work_dir) self._cwd = repo_work_dir self._tempdirname = self._cwd[len(self._system_tmpdir) + 1:] - self._git_repo = git.Repo.init(repo_work_dir) + self._git_repo = git.Repo.init(repo_work_dir, b="default") self._files = [] def switch_cwd_under_repo(self): diff --git a/tests/test_archive_file.py b/tests/test_git_archive_file.py similarity index 95% rename from tests/test_archive_file.py rename to tests/test_git_archive_file.py index 5ca4860..6874322 100644 --- a/tests/test_archive_file.py +++ b/tests/test_git_archive_file.py @@ -28,8 +28,8 @@ class TestGitArchiveFile: def test_archive_file_on_any_not_tags_branch_with_default_branch(self, temp_repo): git = temp_repo.get_repo_git() - git.checkout("master") - git.config("git-extras.default-branch", "master") + git.checkout("default") + git.config("git-extras.default-branch", "default") temp_repo.invoke_installed_extras_command("archive-file") filename = "{0}.{1}.zip".format( temp_repo.get_repo_dirname(), @@ -53,13 +53,13 @@ class TestGitArchiveFile: filename = "{0}.{1}.{2}.zip".format( "backslash-dir", git.describe("--always", "--long"), - "master") + "default") assert filename in os.listdir() def test_archive_file_on_tag_name_has_slash(self, temp_repo): temp_repo.switch_cwd_under_repo() git = temp_repo.get_repo_git() - git.checkout("master") + git.checkout("default") git.tag("--delete", "0.1.0") git.tag("0.1.0/slash", "-m", "bump: 0.1.0") temp_repo.invoke_installed_extras_command("archive-file")