Merge branch 'master' into remove-kv-ws-sl

lra · Nov 4, 2023 · 22f0dbd · 22f0dbd
2 parents 629f6f5 + 4c75d0a
commit 22f0dbd
Show file tree

Hide file tree

Showing 12 changed files with 740 additions and 26 deletions.
diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml
@@ -1,7 +1,5 @@
 name: Test installs
-on:
-  - pull_request
-  - push
+on: pull_request
 
 jobs:
 
@@ -15,6 +13,8 @@ jobs:
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
     runs-on: ubuntu-latest
     container: python:${{ matrix.python-version }}
     steps:

diff --git a/.github/workflows/markdown.yaml b/.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/'
diff --git a/.github/workflows/test.yaml b/.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
diff --git a/.markdownlint.yaml b/.markdownlint.yaml
@@ -0,0 +1,2 @@
+MD004:
+  style: "dash"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@
  - 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
 

diff --git a/Makefile b/Makefile
@@ -1,23 +1,18 @@
-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 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 .
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/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)))

diff --git a/mackup/constants.py b/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"

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,25 @@
+[tool.poetry]
+name = "mackup"
+version = "0.8.38"
+description = "Keep your application settings in sync (macOS/Linux)"
+authors = ["Laurent Raufaste <[email protected]>"]
+license = "GPLv3"
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.8"
+docopt = "^0.6.2"
+six = "^1.16.0"
+
+[tool.poetry.group.dev]
+optional = true
+
+[tool.poetry.group.dev.dependencies]
+nose-py3 = "^1.6.3"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry.scripts]
+mackup = "mackup.main:main"