Merged in refactor/move-constants-to-git_flow (pull request #68)

refactor: move constants to git_flow module

Approved-by: Jonathan Teran

src/git_flow/__init__.py

@@ -49,3 +49,5 @@ SUPPORTED_REMOTE_APIS = [
 ]
 
 REPOSITORY_TOKEN_FILENAME = ".repository-token"
+
+FLOWCONFIG_FILENAME = ".flowconfig"

src/git_flow/command/base.py

@@ -1,9 +1,10 @@
 from git_flow import (
     BRANCH_TYPES,
     REPOSITORY_TOKEN_FILENAME,
+    FLOWCONFIG_FILENAME,
     GitFlowError,
 )
-from git_flow.git import FLOWCONFIG_FILE, Git
+from git_flow.git import Git
 from git_flow.remote.base import RemoteAPI
 from git_flow.remote.bitbucket import BitbucketRemoteAPI
 from git_flow.remote.github import GithubRemoteAPI
@@ -16,7 +17,7 @@ TYPE_ERROR = 2
 TYPE_INFO = 3
 
 
-flowconfig = Git.get_config(FLOWCONFIG_FILE) if isfile(FLOWCONFIG_FILE) else {}
+flowconfig = Git.get_config(FLOWCONFIG_FILENAME) if isfile(FLOWCONFIG_FILENAME) else {}
 
 
 def ensure_initialized():

src/git_flow/command/init.py

@@ -1,7 +1,7 @@
 import typer
 
-from git_flow import GitFlowError
+from git_flow import FLOWCONFIG_FILENAME, GitFlowError
-from git_flow.git import FLOWCONFIG_FILE, Git
+from git_flow.git import Git
 from git_flow.command.base import *
 
 app = typer.Typer()
@@ -25,8 +25,8 @@ def init():
     if remote:
         flowconfig["flow.remote"] = remote
 
-    Git.set_config(flowconfig, FLOWCONFIG_FILE)
+    Git.set_config(flowconfig, FLOWCONFIG_FILENAME)
-    Git("add", FLOWCONFIG_FILE).exec()
+    Git("add", FLOWCONFIG_FILENAME).exec()
     Git("commit", message="feature: initialize git-flow").exec()
 
     _ensure_all_flow_branches_exist(branches, remote)
@@ -43,7 +43,6 @@ def _ensure_is_repository():
 
 
 def _ensure_not_already_initialized():
-    flowconfig = get_config()
     if not flowconfig:
         return
     elif flowconfig.get("flow.initialized") == "true":

src/git_flow/git.py

@@ -1,13 +1,8 @@
 import subprocess
 
+from git_flow import FLOWCONFIG_FILENAME
 from git_flow.io import *
 
-FLOWCONFIG_FILE = ".flowconfig"
-
-CHANGELOG_FILE = "CHANGELOG.md"
-
-BUMP_VERSION = "chore: bump version and update CHANGELOG.md [skip ci]"
-
 
 class Git:
     class Status:
@@ -42,7 +37,7 @@ class Git:
 
     @staticmethod
     def flow_config(*args, **kwargs):
-        return Git("config", *args, file=FLOWCONFIG_FILE, **kwargs)
+        return Git("config", *args, file=FLOWCONFIG_FILENAME, **kwargs)
 
     @staticmethod
     def get_current_branch():