Merge branch 'master' into zed

lra · Nov 4, 2023 · 932db46 · 932db46
2 parents daaefb7 + 077dd4e
commit 932db46
Show file tree

Hide file tree

Showing 29 changed files with 776 additions and 519 deletions.
diff --git a/.github/workflows/install.yaml b/.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
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
@@ -3,6 +3,23 @@
 ## WIP
 
 - Added support for Zed (via @sethherr)
+- Updated support for IntelliJIdea version 2023.1 and 2023.2
+- Updated support for CLion version 2023.1 and 2023.2
+- Updated support for DataGrip version 2023.1 and 2023.2
+- Updated support for GoLand version 2023.1 and 2023.2
+- Updated support for PhpStorm version 2023.1 and 2023.2
+- Updated support for PyCharm version 2023.1 and 2023.2
+- Updated support for RubyMine version 2023.1 and 2023.2
+- Updated support for WebStorm version 2023.1 and 2023.2
+- 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,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 .
diff --git a/Pipfile b/Pipfile
diff --git a/Pipfile.lock b/Pipfile.lock
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:/koekeishiya/khd/)
-- [kindaVim](https://kindavim.app)
 - [kitty](https://sw.kovidgoyal.net/kitty/)
 - [Krew](https:/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/doc/release.md b/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`
diff --git a/mackup/applications/clion.cfg b/mackup/applications/clion.cfg
@@ -4,3 +4,5 @@ name = CLion
 [configuration_files]
 Library/Preferences/CLion2016.2
 Library/Application Support/CLion2016.2
+Library/Application Support/JetBrains/CLion2023.1
+Library/Application Support/JetBrains/CLion2023.2
diff --git a/mackup/applications/datagrip.cfg b/mackup/applications/datagrip.cfg
@@ -13,3 +13,5 @@ Library/Preferences/DataGrip2018.3
 Library/Application Support/DataGrip2019.1
 Library/Preferences/DataGrip2019.1
 Library/Preferences/DataGrip2019.2
+Library/Application Support/JetBrains/DataGrip2023.1
+Library/Application Support/JetBrains/DataGrip2023.2
diff --git a/mackup/applications/goland.cfg b/mackup/applications/goland.cfg
@@ -15,3 +15,5 @@ Library/Preferences/GoLand2018.1
 Library/Preferences/GoLand2018.2
 Library/Preferences/GoLand2018.3
 Library/Preferences/GoLand2019.2
+Library/Application Support/JetBrains/GoLand2023.1
+Library/Application Support/JetBrains/GoLand2023.2
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/intellijidea.cfg b/mackup/applications/intellijidea.cfg
@@ -52,6 +52,8 @@ Library/Application Support/JetBrains/IntelliJIdea2020.3
 Library/Application Support/JetBrains/IntelliJIdea2021.1
 Library/Application Support/JetBrains/IntelliJIdea2022.1
 Library/Application Support/JetBrains/IntelliJIdea2022.2
+Library/Application Support/JetBrains/IntelliJIdea2023.1
+Library/Application Support/JetBrains/IntelliJIdea2023.2
 Library/Preferences/IdeaIC2016.1
 Library/Preferences/IdeaIC2016.2
 Library/Preferences/IdeaIC2016.3

diff --git a/mackup/applications/kindavim.cfg b/mackup/applications/kindavim.cfg
diff --git a/mackup/applications/phpstorm.cfg b/mackup/applications/phpstorm.cfg
@@ -11,6 +11,8 @@ Library/Application Support/JetBrains/PhpStorm2021.3
 Library/Application Support/JetBrains/PhpStorm2022.1
 Library/Application Support/JetBrains/PhpStorm2022.2
 Library/Application Support/JetBrains/PhpStorm2022.3
+Library/Application Support/JetBrains/PhpStorm2023.1
+Library/Application Support/JetBrains/PhpStorm2023.2
 Library/Application Support/PhpStorm2016.1
 Library/Application Support/PhpStorm2016.2
 Library/Application Support/PhpStorm2016.3

diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg
@@ -12,6 +12,8 @@ Library/Application Support/JetBrains/PyCharm2020.2
 Library/Application Support/JetBrains/PyCharm2020.3
 Library/Application Support/JetBrains/PyCharm2020.4
 Library/Application Support/JetBrains/PyCharmCE2020.1
+Library/Application Support/JetBrains/PyCharm2023.1
+Library/Application Support/JetBrains/PyCharm2023.2
 Library/Application Support/PyCharm
 Library/Application Support/PyCharm2016.1
 Library/Application Support/PyCharm2016.2

diff --git a/mackup/applications/rubymine.cfg b/mackup/applications/rubymine.cfg
@@ -22,3 +22,5 @@ Library/Application Support/RubyMine2017.3
 Library/Preferences/RubyMine2017.3
 Library/Application Support/RubyMine2018.1
 Library/Preferences/RubyMine2018.1
+Library/Application Support/JetBrains/RubyMine2023.1
+Library/Application Support/JetBrains/RubyMine2023.2
diff --git a/mackup/applications/scrolla.cfg b/mackup/applications/scrolla.cfg
diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg
@@ -9,6 +9,8 @@ Library/Application Support/JetBrains/WebStorm2020.4
 Library/Application Support/JetBrains/WebStorm2021.1
 Library/Application Support/JetBrains/WebStorm2021.2
 Library/Application Support/JetBrains/WebStorm2021.3
+Library/Application Support/JetBrains/WebStorm2023.1
+Library/Application Support/JetBrains/WebStorm2023.2
 Library/Application Support/WebStorm
 Library/Application Support/WebStorm10
 Library/Application Support/WebStorm11

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

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"