Merge pull request #10 from chmouel/uv

migrate to uv instead of poetry

Author: chmouel

.python-version

@@ -0,0 +1 @@
+3.12

Makefile

@@ -3,13 +3,13 @@ PACKAGE_NAME := nextmeeting
 all: lint run
 
 run:
-	@poetry run $(PACKAGE_NAME)
+	@uv run $(PACKAGE_NAME)
 
 release:
 	@./packaging/make-release.sh
 
 lint:
-	@poetry run ruff $(PACKAGE_NAME)
+	@uv run ruff check src/$(PACKAGE_NAME)
 
 
 .PHONY: lint release run all

README.md

@@ -25,11 +25,11 @@ Use `pip` with:
 
 `pip install -U nextmeeting`
 
-or Checkout the source of this repo and use `poetry` :
+or Checkout the source of this repo by [using uv](https://docs.astral.sh/uv/getting-started/installation/):
 
-`poetry run nextmeeting`
+`uv run nextmeeting`
 
-If you don't want to use poetry you can install the depndences packages from PyPi
+If you don't want to use `uv` you can install the dependences packages from PyPi
 or from your operating system package manager if available:
 
 - <https://pypi.org/project/python-dateutil/>

packaging/aur/PKGBUILD

@@ -9,17 +9,17 @@ arch=('any')
 url="https://github.com/chmouel/nextmeeting"
 license=('Apache')
 depends=('python-dateutil' 'gcalcli')
-makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel' 'python-poetry-core')
 source=("https://github.com/chmouel/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('edfd9aa245aba16bca2f4d219343e55d7d331f5a7bc3cee2874e14dc15951b63')
+makedepends=('python-build' 'python-installer' 'python-wheel' 'python-hatchling')
 
 build() {
-	cd "$pkgname-$pkgver" || exit
-	rm -vf LICENSE
-	python -m build --wheel --no-isolation
+  cd "$pkgname-$pkgver" || exit
+  rm -vf LICENSE
+  python -m build --wheel --no-isolation
 }
 
 package() {
-	cd "${pkgname}-${pkgver}" || exit
-	python -m installer --destdir="$pkgdir" dist/*.whl
+  cd "${pkgname}-${pkgver}" || exit
+  python -m installer --destdir="$pkgdir" dist/*.whl
 }

packaging/aur/build.sh

@@ -2,8 +2,8 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-POETRY_NAME_VERSION="$(poetry version)"
-PKGNAME=${POETRY_NAME_VERSION% *}
+PKGNAME=$(sed -n '/^name = / { s/name = "\(.*\)"/\1/ ;p;}' pyproject.toml)
+PKGVERSION=$(sed -n '/^version = / { s/version = "\(.*\)"/\1/ ;p;}' pyproject.toml)
 AUTHOR_EMAIL="$(git config --get user.email)"
 AUTHOR_NAME="$(git config --get user.name)"
 RELEASE=1
@@ -13,29 +13,29 @@ gitdir=$(git rev-parse --show-toplevel)
 cd "${gitdir}"
 
 while getopts "d" o; do
-	case "${o}" in
-	d)
-		finalaction="echo done"
-		;;
-	*)
-		echo "Invalid option"
-		exit 1
-		;;
-	esac
+  case "${o}" in
+  d)
+    finalaction="echo done"
+    ;;
+  *)
+    echo "Invalid option"
+    exit 1
+    ;;
+  esac
 done
 shift $((OPTIND - 1))
 
-VERSION=${1:-${POETRY_NAME_VERSION#* }}
+VERSION=${1:-${PKGVERSION}}
 
 sudo docker build -f ./packaging/aur/Dockerfile -t ${image_name} .
 
 sudo docker run --rm \
-	-v ~/.config/copr:/home/builder/.config/copr \
-	-v "${gitdir}":/src \
-	-v $SSH_AUTH_SOCK:/ssh-agent --env SSH_AUTH_SOCK=/ssh-agent \
-	--name ${PKGNAME}-builder \
-	-it ${image_name} \
-	/bin/bash -c "set -x;mkdir -p ~/.ssh/;chmod 0700 ~/.ssh && \
+  -v ~/.config/copr:/home/builder/.config/copr \
+  -v "${gitdir}":/src \
+  -v $SSH_AUTH_SOCK:/ssh-agent --env SSH_AUTH_SOCK=/ssh-agent \
+  --name ${PKGNAME}-builder \
+  -it ${image_name} \
+  /bin/bash -c "set -x;mkdir -p ~/.ssh/;chmod 0700 ~/.ssh && \
                          ssh-keyscan aur.archlinux.org >> ~/.ssh/known_hosts && \
                          git clone --depth=1 ssh://aur@aur.archlinux.org/${PKGNAME} /tmp/${PKGNAME} && \
                          cd /tmp/${PKGNAME} && \

packaging/make-release.sh

@@ -1,45 +1,44 @@
 #!/usr/bin/env bash
 set -euf
 VERSION=${1-""}
-POETRY_NAME_VERSION="$(poetry version)"
-PKGNAME=${POETRY_NAME_VERSION% *}
+PKGNAME=$(sed -n '/^name = / { s/name = "\(.*\)"/\1/ ;p;}' pyproject.toml)
 
 docker ps -q >/dev/null || exit 1
 
 bumpversion() {
-   current=$(git describe --tags $(git rev-list --tags --max-count=1))
-   echo "Current version is ${current}"
+  current=$(git describe --tags $(git rev-list --tags --max-count=1))
+  echo "Current version is ${current}"
 
-   major=$(python3 -c "import semver,sys;print(str(semver.VersionInfo.parse(sys.argv[1]).bump_major()))" ${current})
-   minor=$(python3 -c "import semver,sys;print(str(semver.VersionInfo.parse(sys.argv[1]).bump_minor()))" ${current})
-   patch=$(python3 -c "import semver,sys;print(str(semver.VersionInfo.parse(sys.argv[1]).bump_patch()))" ${current})
+  major=$(python3 -c "import semver,sys;print(str(semver.VersionInfo.parse(sys.argv[1]).bump_major()))" ${current})
+  minor=$(python3 -c "import semver,sys;print(str(semver.VersionInfo.parse(sys.argv[1]).bump_minor()))" ${current})
+  patch=$(python3 -c "import semver,sys;print(str(semver.VersionInfo.parse(sys.argv[1]).bump_patch()))" ${current})
 
-   echo "If we bump we get, Major: ${major} Minor: ${minor} Patch: ${patch}"
-   read -p "To which version you would like to bump [M]ajor, Mi[n]or, [P]atch or Manua[l]: " ANSWER
-   if [[ ${ANSWER,,} == "m" ]];then
-       mode="major"
-   elif [[ ${ANSWER,,} == "n" ]];then
-       mode="minor"
-   elif [[ ${ANSWER,,} == "p" ]];then
-       mode="patch"
-   elif [[ ${ANSWER,,} == "l" ]];then
-       read -p "Enter version: " -e VERSION
-       return
-   else
-       print "no or bad reply??"
-       exit
-   fi
-   VERSION=$(python3 -c "import semver,sys;print(str(semver.VersionInfo.parse(sys.argv[1]).bump_${mode}()))" ${current})
-   [[ -z ${VERSION} ]] && {
-       echo "could not bump version automatically"
-       exit
-   }
-   echo "Releasing ${VERSION}"
+  echo "If we bump we get, Major: ${major} Minor: ${minor} Patch: ${patch}"
+  read -p "To which version you would like to bump [M]ajor, Mi[n]or, [P]atch or Manua[l]: " ANSWER
+  if [[ ${ANSWER,,} == "m" ]]; then
+    mode="major"
+  elif [[ ${ANSWER,,} == "n" ]]; then
+    mode="minor"
+  elif [[ ${ANSWER,,} == "p" ]]; then
+    mode="patch"
+  elif [[ ${ANSWER,,} == "l" ]]; then
+    read -p "Enter version: " -e VERSION
+    return
+  else
+    print "no or bad reply??"
+    exit
+  fi
+  VERSION=$(python3 -c "import semver,sys;print(str(semver.VersionInfo.parse(sys.argv[1]).bump_${mode}()))" ${current})
+  [[ -z ${VERSION} ]] && {
+    echo "could not bump version automatically"
+    exit
+  }
+  echo "Releasing ${VERSION}"
 }
 
 [[ $(git rev-parse --abbrev-ref HEAD) != main ]] && {
-    echo "you need to be on the main branch"
-    exit 1
+  echo "you need to be on the main branch"
+  exit 1
 }
 [[ -z ${VERSION} ]] && bumpversion
 
@@ -49,8 +48,10 @@ git commit -S -m "Release ${VERSION} 🥳" ${vfile} || true
 git tag -s ${VERSION} -m "Releasing version ${VERSION}"
 git push --tags origin ${VERSION}
 git push origin main
-poetry build -f sdist
+rm -rf dist/
+mkdir dist
+uv build
 gh release create ${VERSION} ./dist/${PKGNAME}-${VERSION}.tar.gz
-poetry publish -u __token__ -p $(pass show pypi/token)
+uv publish -u __token__ -p $(pass show pypi/token)
 
 ./packaging/aur/build.sh

poetry.lock

@@ -1,31 +1,22 @@
-[tool.poetry]
+[project]
 name = "nextmeeting"
 version = "1.5.3"
 description = "Show your nextmeeting in your poly/waybar with gcalcli"
-authors = ["Chmouel Boudjnah <chmouel@chmouel.com>"]
-keywords = ["calendar", "cli"]
 readme = "README.md"
+authors = [{ name = "Chmouel Boudjnah", email = "chmouel@chmouel.com" }]
+requires-python = ">=3.9"
 license = "Apache-2.0"
-homepage = "https://github.com/chmouel/nextmeeting"
-repository = "https://github.com/chmouel/nextmeeting"
-include = ["LICENSE"]
+dependencies = ["python-dateutil>=2.9.0.post0"]
 classifiers = ["License :: OSI Approved :: Apache Software License"]
+keywords = ["calendar", "cli"]
 
-[tool.poetry.dependencies]
-python = "^3.9"
-python-dateutil = "^2.8.2"
-
-[tool.poetry.scripts]
+[project.scripts]
 nextmeeting = "nextmeeting.cli:main"
 
-[tool.poetry.group.dev.dependencies]
-ruff = "^0.0.291"
-mypy = "^0.920"
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [tool.ruff.lint]
 ignore = ["E501", "PLR0912"]
 select = ["E", "F", "D4", "PT", "PL"]
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"