Fix CI (#1952)

* Fix CI

* use dash

* ignore test fixtures

* Update python versions

Follows https://devguide.python.org/versions/

* More python versions

* typo

* 3.13 container not found

* Test with poetry

* Add path

* fix path

* test only on 3.8 and 3.9

* Update CHANGELOG.md

* Use nose-py3

* Update test.yaml

* on PRs only

.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:

.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,10 @@
 
 ## WIP
 
+## Mackup 0.8.38
+
+- Build and release with poetry
+
 ## Mackup 0.8.37
 
 - Added support for macOS Preview (via @iloveitaly)

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 .

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"

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 <analogue@glop.org>"]
+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"