Merge branch 'master' into clean_non_poetry_files

lra · Nov 4, 2023 · c84fb36 · c84fb36
2 parents cfbb913 + a60d177
commit c84fb36
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## WIP
 
+- Removed support for kindaVim (via @godbout)
+- Removed support for Wooshy (via @godbout)
+- Removed support for Scrolla (via @godbout)
+- fix: Deprecated SafeConfigParser resolved
+- bugfix: added Brewfile
+
 ## Mackup 0.8.38
 
 - Build and release with poetry

diff --git a/README.md b/README.md
@@ -414,7 +414,6 @@ See the [README](doc/README.md) file in the doc directory for more info.
 - [Keymo](http://manytricks.com/keymo/)
 - [KeyRemap4MacBook](https://pqrs.org/osx/karabiner/)
 - [Khd](https://github.com/koekeishiya/khd/)
-- [kindaVim](https://kindavim.app)
 - [kitty](https://sw.kovidgoyal.net/kitty/)
 - [Krew](https://github.com/kubernetes-sigs/krew)
 - [Kubectl](https://kubernetes.io/docs/reference/kubectl/overview/)
@@ -597,7 +596,6 @@ See the [README](doc/README.md) file in the doc directory for more info.
 - [Screenhero](https://screenhero.com)
 - [Scrivener](http://www.literatureandlatte.com/scrivener.php)
 - [Scroll Reverser](https://pilotmoon.com/scrollreverser/)
-- [Scrolla](https://scrolla.app)
 - [SecureCRT](https://www.vandyke.com/products/securecrt/)
 - [Secure Pipes](http://www.opoet.com/)
 - [Seil](https://pqrs.org/osx/karabiner/seil.html.en)
@@ -702,7 +700,6 @@ See the [README](doc/README.md) file in the doc directory for more info.
 - [WhatsApp Web](https://web.whatsapp.com/)
 - [Wireshark 2](https://www.wireshark.org)
 - [Witch](http://manytricks.com/witch/)
-- [Wooshy](https://wooshy.app)
 - [WordGrinder](https://cowlark.com/wordgrinder/)
 - [WordPress WP-CLI](http://wp-cli.org/)
 - [Workrave](http://www.workrave.org/)

diff --git a/mackup/applications/homebrew.cfg b/mackup/applications/homebrew.cfg
@@ -3,3 +3,4 @@ name = Homebrew
 
 [configuration_files]
 .Brewfile
+Brewfile
diff --git a/mackup/applications/kindavim.cfg b/mackup/applications/kindavim.cfg
diff --git a/mackup/applications/scrolla.cfg b/mackup/applications/scrolla.cfg
diff --git a/mackup/applications/wooshy.cfg b/mackup/applications/wooshy.cfg
diff --git a/mackup/appsdb.py b/mackup/appsdb.py
@@ -26,7 +26,7 @@ def __init__(self):
         self.apps = dict()
 
         for config_file in ApplicationsDatabase.get_config_files():
-            config = configparser.SafeConfigParser(allow_no_value=True)
+            config = configparser.ConfigParser(allow_no_value=True)
 
             # Needed to not lowercase the configuration_files in the ini files
             config.optionxform = str

diff --git a/mackup/config.py b/mackup/config.py
@@ -139,15 +139,15 @@ def _setup_parser(self, filename=None):
             filename (str) or None
 
         Returns:
-            SafeConfigParser
+            ConfigParser
         """
         assert isinstance(filename, str) or filename is None
 
         # If we are not overriding the config filename
         if not filename:
             filename = MACKUP_CONFIG_FILE
 
-        parser = configparser.SafeConfigParser(
+        parser = configparser.ConfigParser(
             allow_no_value=True, inline_comment_prefixes=(";", "#")
         )
         parser.read(os.path.join(os.path.join(os.environ["HOME"], filename)))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@ name = Homebrew

		[configuration_files]
		.Brewfile
		Brewfile