Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI #1952

Merged
merged 15 commits into from
Nov 4, 2023
Merged

Fix CI #1952

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/install.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
name: Test installs
on:
- pull_request
- push
on: pull_request

jobs:

Expand All @@ -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:
Expand Down
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/'
13 changes: 6 additions & 7 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 @@ -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
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## WIP

## Mackup 0.8.38

- Build and release with poetry

## Mackup 0.8.37

- Added support for macOS Preview (via @iloveitaly)
Expand Down
13 changes: 4 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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 .
2 changes: 1 addition & 1 deletion mackup/constants.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Constants used in Mackup."""
# Current version
VERSION = "0.8.37"
VERSION = "0.8.38"

# Support platforms
PLATFORM_DARWIN = "Darwin"
Expand Down
684 changes: 684 additions & 0 deletions poetry.lock

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
Loading