Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
lra authored Nov 5, 2023
2 parents b07cf80 + f94a50c commit 4711ec9
Show file tree
Hide file tree
Showing 165 changed files with 1,965 additions and 583 deletions.
22 changes: 22 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
### All submissions

* [ ] I have followed the [Contributing Guidelines](https://github.com/lra/mackup/blob/master/.github/CONTRIBUTING.md)
* [ ] I have checked to ensure there aren't other open [Pull Requests](https://github.com/lra/mackup/pulls) for the same update/change

### Adding/updating Application X Support

* [ ] This PR is only for one application
* [ ] It has been added to the list of supported applications in the [README](https://github.com/lra/mackup/blob/master/README.md)
* [ ] Changes have been added to the WIP section of the [CHANGELOG](https://github.com/lra/mackup/blob/master/CHANGELOG.md)
* [ ] Syncing does not break the application
* [ ] Syncing does not compete with any syncing functionality internal to the application
* [ ] The configuration syncs the minimal set of data
* [ ] No file specific to the local workstation is synced
* [ ] No sensitive data is synced

### Improving the Mackup codebase

* [ ] My submission passes the [tests](https://github.com/lra/mackup/tree/master/tests)
* [ ] I have linted the code locally prior to submission
* [ ] I have written new tests as applicable
* [ ] I have added an explanation of what the changes do
37 changes: 26 additions & 11 deletions .github/workflows/install.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,36 @@
name: Test installs
on:
- pull_request
- push
on: pull_request

jobs:

install:
install-on-linux:
strategy:
matrix:
os:
- "ubuntu-20.04"
- "ubuntu-22.04"
python-version:
- 2.7
- 3.6
- 3.7
- 3.8
runs-on: ubuntu-latest
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
runs-on: ${{ matrix.os }}
container: python:${{ matrix.python-version }}
steps:
- uses: actions/checkout@v2
- run: python setup.py install
- uses: actions/checkout@v4
- run: pip install .
- run: mackup --help

install-on-macos:
strategy:
matrix:
os:
- macos-11
- macos-12
- macos-13
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- run: pip install .
- run: mackup --help
16 changes: 16 additions & 0 deletions .github/workflows/linelint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Make sure that all text files end with a newline character.
# Configure your editor to end every file with a newline character.
# See <https://stackoverflow.com/a/729795>
on:
- pull_request
- push
name: linelint
jobs:
linelint:
runs-on: ubuntu-latest
name: Check if all files end with a newline character
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Linelint
uses: fernandrone/linelint@master
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ jobs:
container: python
steps:
- run: pip install black
- uses: actions/checkout@v2
- run: black --check --target-version py27 .
- uses: actions/checkout@v4
- run: black --check --target-version py310 .
8 changes: 5 additions & 3 deletions .github/workflows/markdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/'
21 changes: 11 additions & 10 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
name: Run tests
on:
- pull_request
- push
on: pull_request

jobs:

Expand All @@ -10,20 +8,23 @@ jobs:
container: python:2.7
steps:
- run: pip install docopt six nose
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- run: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup

nose:
runs-on: ubuntu-latest
strategy:
matrix:
python-version:
- 3.6
- 3.7
- 3.8
- "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
- uses: actions/checkout@v2
- run: pipenv install -d
- run: echo "${HOME}/.local/bin" >> $GITHUB_PATH
- run: pip install pipx
- run: pipx install poetry
- uses: actions/checkout@v4
- run: make test
19 changes: 19 additions & 0 deletions .linelint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 'true' will fix files
autofix: false

# list of paths to ignore, uses gitignore syntaxes (executes before any rule)
ignore:
- tests/fixtures/Library/Application Support/Box/Box Sync/sync_root_folder.txt
- tests/fixtures/Library/Mobile Documents/com~apple~CloudDocs/_blank_.md

rules:
# checks if file ends in a newline character
end-of-file:
# set to true to enable this rule
enable: true

# set to true to disable autofix (if enabled globally)
disable-autofix: true

# if true also checks if file ends in a single newline character
single-new-line: true
2 changes: 2 additions & 0 deletions .markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
MD004:
style: "dash"
4 changes: 4 additions & 0 deletions .mdl_style.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
all
rule 'MD007', :indent => 2
rule 'MD029', :style => :ordered
exclude_rule 'MD041'
1 change: 1 addition & 0 deletions .mdlrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
style './.mdl_style.rb'
184 changes: 182 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,185 @@

## WIP

- Updated support for GeekTool (via @yuchen-lea)
- Remve support for Apple Preview, problematic on macOS 14.1
- Added support for Subler (via @EpicKris)

## Mackup 0.8.39

- Updated support for Factorio (via @jpuris)
- 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

- Added support for macOS Preview (via @iloveitaly)
- Fixed support for Bat (via @grigorii-horos)
- Added support for Rust (via @grigorii-horos)
- Added support for Termux (via @grigorii-horos)
- Added support for Stats (via @iloveitaly)
- Fixed support for LunarVim 1.2 (via @secsaba)
- Fixed support for Base (via @iloveitaly)
- Added support for ActivityWatch (via @YiGeon)
- Added support for dozer (via @iloveitaly)
- Added support for Zoom (via @iloveitaly)
- Fixed support for LunarVim (via @YiGeon)
- Updated support for Caffeine (via @joshmedeski)
- Added support for PrusaSlicer (via @visika)
- Added support for Logseq (via @visika)
- Updated support for iTerm2 (via @LucasLarson)
- Added support for SwitchHosts (via @zxjlm)
- Added support for Warp (via @drallas)
- Added support for Wooshy (via @godbout)
- Added support for Scrolla (via @godbout)
- Updated support for Amethyst (via @max-sixty)
- Added support for Elgato StreamDeck (via @fharper)
- Added support for ni (via @wxh16144)
- Added support for TablePlus Favorites (via @pesonn)
- Added support for asdf .default-npm-packages
- Updated poetry config location (via @syphar)
- Updated support for vim (via @iarchean)
- Updated support for Maven: include settings-security.xml (via @stevenodb)
- Added support for GoLand 2019.2 (via @carlossg)

## Mackup 0.8.36

- Added support for LunarVim (via @YiGeon)
- Added support for Airflow (via @Evertt)
- Updated support for yabai (via @Liu233w)
- Updated suport for skhd (via @jonasdiemer)
- Added support for Sizzy (via @driftingly)

## Mackup 0.8.35

- Updated support for iTerm2 (via @michielgerritsen)
- Added support for NSLogger (via @lavareX)
- Added support for Fork (via @lavareX)
- Updated support for Proxymann Setapp version (via @JanC)
- Added support for Btop (via @Mersid)
- Updated support for Nushell (via @maradude)
- Updated support for CleanShot (via @timfee)
- Added backwards-compatibility support for Espanso (via @joshmedeski)

## Mackup 0.8.34

- Updated support for Bash it (via @jacopkane)
- Added support for Remote Desktop Manager (via @jpmat296)
- Fixed support for asciinema (via @revolter)
- Added support for Mumu (via @fharper)
- Updated support for fasd (via @doubleloop)
- Updated support for lazygit (via @joshmedeski)
- Added support for Nova (via @guillaumealgis)
- Added support for Oracle Cloud Infrastructure CLI (via @Djelibeybi)
- Added support for PicGo (via @SSBun)
- Added support for Flameshot (via @joshmedeski)
- Added support for Planner (via @spawnedc)
- Fixed support for k9s (via @gamussa)
- Added support for act (via @fharper)
- Added support for notion-enhancer (via @fharper)
- Added support for GitFox (via @L3K0V)
- Updated support for Bartender through SetApp (via @dbhagen)
- Updated support for Xonsh (via @wy-z)
- Added support for TablePlus history (via @annuh)
- Added support for xbar (via @dnicolson)
- Added support for Beyond Compare (via @mgraham)
- Added support for kindaVim (via @godbout)

## Mackup 0.8.33

- Added support for Lightroom Classic (via @treee111)
- Fixed support for Hocus Focus (via @jrolfs)
- Added support for KeePassXC (via @harens)
- Fixed support for poetry (via @ameyuuno)
- Added support for npm package npmrc (via @jdvivar)
- Added support for rubiTrack 5 (via @otherguy)
- Updated support for Fisher (via @kidonng)
- Added support for Qv2ray (via @kidonng)
- Added support for Neofetch (via @kidonng)
- Added support for PsySH (via @nesk)
- Added support for polybar(via @jneo8)
- Added support for Tiles (via @damianoamatruda)
- Added support for Flake8 (via @hongqn)
- Fixed support for HandBrake (via @damianoamatruda)
- Added support for Loopback (via @damianoamatruda)
- Added support for IDA Pro (via @damianoamatruda)
- Added support for MuteSpotifyAds (via @damianoamatruda)
- Added support for Ghidra (via @damianoamatruda)
- Added support for Logitech Options (via @damianoamatruda)
- Added support for OBS (via @damianoamatruda)
- Update uninstall prompt for accuracy (via @soneji)
- Added support for Proxyman (via @NghiaTranUIT)
- Updated support for IntelliJIdea version 2021.1 (via @steffenmalisi)
- Added support for Sublime Text 4 (via @TCattd)
- Added support for Contexts (via @antoni-k)
- Added support for Swish (via @antoni-k)
- Added support for AltTab (via @aiotter)
- Added support for Goku (via @thebengeu)
- Added support for Akamai CLI (via @anirudhbagri)
- Added support for FastScripts (via @darrenbkl)
- Added support for Affinity Designer (via @EpicKris)
- Added support for Affinity Photo (via @EpicKris)
- Added support for Affinity Publisher (via @EpicKris)
- Added support for MTMR (via @dec0dOS)
- Added support for Rocket (via @revolter)
- Updated support for BetterTouchTool (via @grapswiz)
- Updated support for k9s (via @dfang)
- Added support for Mendeley Desktop (via @aiotter)
- Added support for CleanShot, Mosaic, Eagle and Nuget (via @ye4241)

## Mackup 0.8.32

- Fixed an issue due to a duplicate entry in the intellijidea config
- Added support for Visual Studio for Mac version 8 (via @Qythyx)

## Mackup 0.8.31

- Fixed an issue due to a duplicate entry in the webstorm config

## Mackup 0.8.30

- Added support for SpaceVim (via @ionlights)
- Added support for clashX (via @awkj)
- Added support for Brave (via @cbenv)
- Added support for Nushell (via @leesiongchan)
- Updated support for Clipy (via @jclerc)
- Added support for aerc (via @Crocmagnon)
- Added support for espanso (via @maxandersen)
- Added support for lazygit (via @joshmedeski)
- Added support for WebStorm versions 2019.4, 2020.2, 2020.3, 2020.4 (via @bdcarr)
- Added support for rbenv (via @dfang)
- Added support for draft (via @dfang)
- Added support for lf (via @joshmedeski)
- Added support for Beets (via @publicarray)
- Added support for Krew (via @exherb)
- Added support for Homebrew (via @exherb)
- Added support for PyCharm versions 2020.2, 2020.3, 2020.4 (via @ameyuuno)
- Added support for Netlify (via @pgilad)
- Added support for K9s (via @tareksamni)
- Added support for Powerlevel10k (via @tareksamni)
- Updated support for aria2 (via @hongqn)
- Update support for IntelliJ (via @scooby)
- Added support for zoxide (via @kidonng)
- Added support for Raycast (via @janniks)

## Mackup 0.8.29

- Added support for waybar (via @mk-atlassian)
- Added support for mako (via @mk-atlassian)
- Added support for Swaywm (via @mk-atlassian)
Expand Down Expand Up @@ -228,6 +407,7 @@
- Add support for DaisyDisk (via @cafferata)
- Add support for MySQLWorkbench (via @cafferata)
- Add support for Openbox (via @jpfarcy)
- Change OS X to macOS to match OS name change (via @samdoran)

## Mackup 0.8.16

Expand Down Expand Up @@ -413,7 +593,7 @@
- Added support of WebStorm 10 (via @morphinewan)
- Added support of Gnome SSH Tunnel Manager (via @skyrocknroll)
- Added support for Hammerspoon (via @jkaan)
- Added support for Bitchx (via @troywilson_)
- Added support for Bitchx (via @troywilson\_)
- Added support for EditorConfig (via @chadluo)
- Add com.agilebits.onepassword4.plist in 1Password (via @amatos)
- Added support for Versions (via @amatos)
Expand Down Expand Up @@ -723,7 +903,7 @@
- Added support for Ack (via @adamlogic)
- Added support for Stata and SelfControl (via @kfinlay)
- Added support for LaTeXiT (via @twsh)
- Do not link ~/Library/* files on GNU/Linux, should fix #104
- Do not link ~/Library/\* files on GNU/Linux, should fix #104

## Mackup 0.5

Expand Down
Loading

0 comments on commit 4711ec9

Please sign in to comment.