Merge branch 'master' into dependabot/pip/cryptography-41.0.3

.github/workflows/install.yaml

@@ -1,23 +1,20 @@
 name: Test installs
-on:
-  - pull_request
-  - push
+on: pull_request
 
 jobs:
 
   install:
     strategy:
       matrix:
         python-version:
-          - "2.7"
-          - "3.6"
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
     runs-on: ubuntu-latest
     container: python:${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v2
-      - run: python setup.py install
+      - run: pip install .
       - run: mackup --help

.github/workflows/markdown.yaml

@@ -7,7 +7,9 @@ jobs:
 
   mdl:
     runs-on: ubuntu-latest
-    container: rsrchboy/mdl
     steps:
-      - uses: actions/checkout@v2
-      - run: mdl .
+      - uses: actions/checkout@v4
+      - uses: articulate/actions-markdownlint@v1
+        with:
+          config: .markdownlint.yaml
+          ignore: 'tests/'

.github/workflows/test.yaml

@@ -1,7 +1,5 @@
 name: Run tests
-on:
-  - pull_request
-  - push
+on: pull_request
 
 jobs:
 
@@ -18,14 +16,15 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.6"
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+          # - "3.12" # Installing numpy (1.24.4): Failed
     container: python:${{ matrix.python-version }}
     steps:
-      - run: pip install pipenv
+      - run: echo "${HOME}/.local/bin" >> $GITHUB_PATH
+      - run: pip install pipx
+      - run: pipx install poetry
       - uses: actions/checkout@v2
-      - run: pipenv install -d
       - run: make test

.markdownlint.yaml

@@ -0,0 +1,2 @@
+MD004:
+  style: "dash"

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## 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
+
 ## Mackup 0.8.37
 
 - Added support for macOS Preview (via @iloveitaly)

Makefile

@@ -1,23 +1,19 @@
-develop:
-	pipenv run python setup.py develop
-
-undevelop:
-	pipenv run python setup.py develop --uninstall
-
 lint:
 	# Install mdl with "gem install mdl"
 	mdl .
 
 test:
-	pipenv run nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup
+	poetry install --with dev
+	poetry run nosetests --with-coverage --cover-branches --cover-package=mackup
 
 clean:
+	rm -rf __pycache__
 	rm -rf dist/
 	rm -rf Mackup.egg-info/
 
 release: clean
-	pipenv run python setup.py sdist
-	pipenv run twine upload dist/*
+	poetry build
+	poetry publish
 
 black:
 	black --target-version py310 .

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/)

doc/release.md

@@ -1,9 +1,10 @@
 # Release
 
 1. Move all the WIP changes under a new version in the [changelog](../CHANGELOG.md)
-2. Increment the version in [constants.py](../mackup/constants.py)
-3. `git commit` with the message `Mackup X.Y.Z`
-4. `git tag <version>`
-5. `git push`
-6. `git push --tags`
-7. `make release`
+1. Increment the version in [constants.py](../mackup/constants.py)
+1. Increment the version in [pyproject.toml](../pyproject.toml)
+1. `git commit` with the message `Mackup X.Y.Z`
+1. `git tag <version>`
+1. `git push`
+1. `git push --tags`
+1. `make release`

mackup/applications/homebrew.cfg

@@ -3,3 +3,4 @@ name = Homebrew
 
 [configuration_files]
 .Brewfile
+Brewfile

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

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)))

mackup/constants.py

@@ -1,6 +1,6 @@
 """Constants used in Mackup."""
 # Current version
-VERSION = "0.8.37"
+VERSION = "0.8.38"
 
 # Support platforms
 PLATFORM_DARWIN = "Darwin"