Switch to rye

.github/workflows/ci.yml

@@ -5,6 +5,7 @@ on:
  branches:
  - main
  merge_group:
+
 jobs:
  lint_with_ruff:
 
@@ -19,22 +20,15 @@ jobs:
  working-directory: ${{ matrix.directory }}
 
  steps:
- - uses: actions/checkout@v3
- - name: Set up Python
- uses: actions/setup-python@v4
- with:
- python-version: '3.11'
- - name: Install ruff
- run: |
- python -m pip install --upgrade pip
- pip install ruff
- - name: Lint with ruff
- run: |
- ruff check --output-format=github type_enum*
- - name: Format with ruff
- run: |
- ruff format --check type_enum*
-
+ - uses: actions/checkout@v3
+ - name: Install rye
+ uses: eifinger/setup-rye@v1
+ - name: Lint with ruff
+ run: |
+ rye lint -- --output-format=github
+ - name: Format with ruff
+ run: |
+ rye fmt -- --diff type_enum*
 
  run_tests:
  runs-on: ubuntu-latest
@@ -45,19 +39,15 @@ jobs:
 
  steps:
  - uses: actions/checkout@v3
- - name: Install poetry
- run: pipx install poetry
- - uses: actions/setup-python@v4
- with:
- python-version: '3.11'
+ - name: Install rye
+ uses: eifinger/setup-rye@v1
 
  - name: Install dependencies
  run: |
- poetry env use 3.11
- poetry install --no-interaction --no-root
+ rye sync --no-lock
  - name: Run tests
  run: |
- poetry run python -m unittest -v
+ rye run test -v
 
  type_check:
  runs-on: ubuntu-latest
@@ -68,16 +58,12 @@ jobs:
 
  steps:
  - uses: actions/checkout@v3
- - name: Install poetry
- run: pipx install poetry
- - uses: actions/setup-python@v4
- with:
- python-version: '3.11'
+ - name: Install rye
+ uses: eifinger/setup-rye@v1
 
  - name: Install dependencies
  run: |
- poetry env use 3.11
- poetry install --no-interaction --no-root
+ rye sync --no-lock
  - name: Run type check
  run: |
- poetry run mypy tests
+ rye run mypy tests

.gitignore

@@ -127,6 +127,3 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
-
-# project-specific
-/type-enum/README.md

make_release.sh

@@ -7,7 +7,7 @@ set -e
 version_bump=$1
 
 case $version_bump in
- "patch" | "minor" | "major" | "prepatch" | "preminor" | "premajor" | "prerelease")
+ "patch" | "minor" | "major")
  echo "valid version bump: $version_bump"
  ;;
  *)
@@ -47,7 +47,7 @@ bump_build_publish() {
  echo "#######################################"
  echo "# bump version #"
  echo "#######################################"
- poetry version $version_bump
+ rye version -b $version_bump
 
  echo "#######################################"
  echo "# stage pyroject.toml #"
@@ -57,15 +57,15 @@ bump_build_publish() {
  echo "#######################################"
  echo "# do new build #"
  echo "#######################################"
- poetry build
+ rye build
 
  echo ""
  echo "#######################################"
  echo "# publish package #"
  echo "#######################################"
  # to use this, set up an API token with
  # `poetry config pypi-token.pypi <api token>`
- poetry publish
+ rye publish
 
  echo "#######################################"
  echo "# leaving '$1' #"
@@ -80,7 +80,7 @@ bump_build_publish "type-enum-plugin"
 
 # get the version from 'type_enum'
 pushd type-enum
-new_version=$(poetry version -s)
+new_version=$(rye version)
 popd
 
 echo "#######################################"

pyproject.toml

@@ -0,0 +1,11 @@
+[project]
+name = "type-enum-workspace"
+version = "0.0.0"
+requires-python = ">= 3.11"
+
+[tool.rye]
+managed = true
+virtual = true
+
+[tool.rye.workspace]
+members = ["type-enum*"]

requirements-dev.lock

@@ -0,0 +1,18 @@
+# generated by rye
+# use `rye lock` or `rye sync` to update this lockfile
+#
+# last locked with the following flags:
+# pre: false
+# features: []
+# all-features: false
+# with-sources: false
+
+-e file:type-enum
+-e file:type-enum-plugin
+mypy==1.7.1
+ # via type-enum-plugin
+mypy-extensions==1.0.0
+ # via mypy
+ruff==0.2.2
+typing-extensions==4.9.0
+ # via mypy

requirements.lock

@@ -0,0 +1,17 @@
+# generated by rye
+# use `rye lock` or `rye sync` to update this lockfile
+#
+# last locked with the following flags:
+# pre: false
+# features: []
+# all-features: false
+# with-sources: false
+
+-e file:type-enum
+-e file:type-enum-plugin
+mypy==1.8.0
+ # via type-enum-plugin
+mypy-extensions==1.0.0
+ # via mypy
+typing-extensions==4.9.0
+ # via mypy

type-enum-plugin/pyproject.toml

@@ -1,34 +1,42 @@
-[tool.poetry]
+[project]
 name = "type-enum-plugin"
 version = "0.3.1a0"
 description = "Mypy plugin for type-enum."
-authors = ["Thomas MK <[email protected]>"]
-license = "Apache License 2.0"
+authors = [
+ { name = "Thomas MK", email = "[email protected]" },
+]
+license = { text = "Apache-2.0" }
 readme = "README.md"
-packages = [{ include = "type_enum_plugin" }]
+# packages = [{ include = "type_enum_plugin" }]
 classifiers = [
  "Programming Language :: Python :: 3.11",
  "Programming Language :: Python :: 3.12",
  "License :: OSI Approved :: Apache Software License",
  "Operating System :: OS Independent",
 ]
-repository = "https://github.com/tmke8/type_enum"
+requires-python = ">=3.11"
+dependencies = [
+ "mypy",
+]
 
-[tool.poetry.dependencies]
-python = "^3.11"
-mypy = "*"
+[project.urls]
+Documentation = "https://github.com/tmke8/type-enum#readme"
+Issues = "https://github.com/tmke8/type-enum/issues"
+Source = "https://github.com/tmke8/type-enum"
 
-[tool.poetry.group.dev.dependencies]
-mypy = "^1.5"
-ruff = ">=0.0.292"
+[tool.rye]
+managed = true
+dev-dependencies = ["mypy >= 1.5", "ruff >= 0.0.292"]
 
 [tool.ruff]
 line-length = 88
+
+[tool.ruff.lint]
 select = [
  "I", # isort
 ]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-third-party = ["mypy", "pytest"]
 extra-standard-library = ["typing_extensions"]
 no-lines-before = ["future", "standard-library"]
@@ -37,5 +45,5 @@ split-on-trailing-comma = false
 classes = ["MDEF"]
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["hatchling"]
+build-backend = "hatchling.build"

type-enum/example.py

@@ -1,12 +1,16 @@
 from typing import Final
+
 from type_enum import TypeEnum
 
+
 class BgColor(TypeEnum):
  transparent = ()
  a = 32
  name = (str,)
  rgb = {"red": int, "green": int, "blue": int} # named args
  hsv = {"hue": int, "saturation": int, "value": int}
+
+
 reveal_type(BgColor.rgb)
 background_color = BgColor.rgb(red=39, green=127, blue=168)
 reveal_type(background_color.red)
@@ -26,4 +30,5 @@ def f(color: BgColor) -> None:
  case BgColor.hsv(hue=h, saturation=s, value=v):
  print(f"HSV: {h}, {s}, {v}")
 
+
 f(background_color)