Add support for pyproject.toml

zest/releaser/baserelease.py

@@ -77,15 +77,17 @@ def __init__(self, vcs=None):
                 "zest.releaser.tests", "pypirc_old.txt"
             )
             self.pypiconfig = pypi.PypiConfig(pypirc_old)
+            self.zest_releaser_config = pypi.ZestReleaserConfig(pypirc_config_filename=pypirc_old)
         else:
             self.pypiconfig = pypi.PypiConfig()
-        if self.pypiconfig.no_input():
+            self.zest_releaser_config = pypi.ZestReleaserConfig()
+        if self.zest_releaser_config.no_input():
             utils.AUTO_RESPONSE = True
 
     @property
     def history_format(self):
         default = "rst"
-        config_value = self.pypiconfig.history_format()
+        config_value = self.zest_releaser_config.history_format()
         history_file = self.data.get("history_file") or ""
         return utils.history_format(config_value, history_file)
 
@@ -124,8 +126,8 @@ def _grab_history(self):
         self.data["headings"] = []
         self.data["history_last_release"] = ""
         self.data["history_insert_line_here"] = 0
-        default_location = self.pypiconfig.history_file()
-        fallback_encoding = self.pypiconfig.encoding()
+        default_location = self.zest_releaser_config.history_file()
+        fallback_encoding = self.zest_releaser_config.encoding()
         history_file = self.vcs.history_file(location=default_location)
         self.data["history_file"] = history_file
         if not history_file:
@@ -416,7 +418,7 @@ def _push(self):
         push_cmds = self.vcs.push_commands()
         if not push_cmds:
             return
-        default_anwer = self.pypiconfig.push_changes()
+        default_anwer = self.zest_releaser_config.push_changes()
         if utils.ask("OK to push commits to the server?", default=default_anwer):
             for push_cmd in push_cmds:
                 output = execute_command(push_cmd)
@@ -440,8 +442,8 @@ def execute(self):
         raise NotImplementedError()
 
     def update_commit_message(self, msg):
-        prefix_message = self.pypiconfig.prefix_message()
-        extra_message = self.pypiconfig.extra_message()
+        prefix_message = self.zest_releaser_config.prefix_message()
+        extra_message = self.zest_releaser_config.extra_message()
         if prefix_message:
             msg = "%s %s" % (prefix_message, msg)
         if extra_message:

zest/releaser/bumpversion.py

@@ -109,9 +109,9 @@ def _grab_version(self, initial=False):
                 feature=feature,
                 breaking=breaking,
                 final=final,
-                less_zeroes=self.pypiconfig.less_zeroes(),
-                levels=self.pypiconfig.version_levels(),
-                dev_marker=self.pypiconfig.development_marker(),
+                less_zeroes=self.zest_releaser_config.less_zeroes(),
+                levels=self.zest_releaser_config.version_levels(),
+                dev_marker=self.zest_releaser_config.development_marker(),
             )
             if final:
                 minimum_version = utils.suggest_version(original_version, **params)

zest/releaser/git.py

@@ -68,7 +68,7 @@ def cmd_diff(self):
 
     def cmd_commit(self, message):
         parts = ["git", "commit", "-a", "-m", message]
-        if not self.pypi_cfg.run_pre_commit():
+        if not self.zest_releaser_config.run_pre_commit():
             parts.append("-n")
         return parts
 

zest/releaser/postrelease.py

@@ -47,7 +47,7 @@ def __init__(self, vcs=None, breaking=False, feature=False, final=False):
                 feature=feature,
                 final=final,
                 dev_version_template=DEV_VERSION_TEMPLATE,
-                development_marker=self.pypiconfig.development_marker(),
+                development_marker=self.zest_releaser_config.development_marker(),
                 history_header=HISTORY_HEADER,
                 update_history=True,
             )
@@ -82,9 +82,9 @@ def _ask_for_new_dev_version(self):
             breaking=self.data["breaking"],
             feature=self.data["feature"],
             final=self.data["final"],
-            less_zeroes=self.pypiconfig.less_zeroes(),
-            levels=self.pypiconfig.version_levels(),
-            dev_marker=self.pypiconfig.development_marker(),
+            less_zeroes=self.zest_releaser_config.less_zeroes(),
+            levels=self.zest_releaser_config.version_levels(),
+            dev_marker=self.zest_releaser_config.development_marker(),
         )
         suggestion = utils.suggest_version(current, **params)
         print("Current version is %s" % current)

zest/releaser/prerelease.py

@@ -45,7 +45,7 @@ class Prereleaser(baserelease.Basereleaser):
     def __init__(self, vcs=None):
         baserelease.Basereleaser.__init__(self, vcs=vcs)
         # Prepare some defaults for potential overriding.
-        date_format = self.pypiconfig.date_format()
+        date_format = self.zest_releaser_config.date_format()
         self.data.update(
             dict(
                 commit_msg=PRERELEASE_COMMIT_MSG,