Merge branch 'main' into uv

Author: sgmdlt

.github/workflows/pyci.yml

@@ -9,20 +9,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.12'
-        # make depends on uv
+          python-version: ${{ matrix.python-version }}
+        # make depends on poetry
       - name: Install dependencies
         run: |
-          pip install uv
+          pip install poetry
           make install
       - name: Run linter and pytest
         run: |
           make check
       - name: Test & publish code coverage
-        uses: paambaati/codeclimate-action@v9.0.0
+        uses: paambaati/codeclimate-action@v5.0.0
         if: github.ref_name == 'main'
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}

Makefile

@@ -1,21 +1,24 @@
 install:
-	uv sync
+	poetry install
 
 run:
 	uv run hexlet-python-package
 
 test:
-	uv run pytest
+	poetry run pytest
 
 test-coverage:
-	uv run pytest --cov=hexlet_python_package --cov-report xml
+	poetry run pytest --cov=hexlet_python_package --cov-report xml
 
 lint:
-	uv run ruff check
+	poetry run flake8 hexlet_python_package
 
-check: test lint
+selfcheck:
+	poetry check
 
-build:
-	uv build
+check: selfcheck test lint
+
+build: check
+	poetry build
 
 .PHONY: install test lint selfcheck check build

README.md

@@ -8,11 +8,11 @@
 
 This project was built using these tools:
 
-| Tool                                                                   | Description                                             |
-|------------------------------------------------------------------------|---------------------------------------------------------|
-| [uv](https://docs.astral.sh/uv/)                                       | "An extremely fast Python package and project manager, written in Rust" |
-| [Pytest](https://pytest.org)                                           | "A mature full-featured Python testing tool"            |
-| [ruff](https://docs.astral.sh/ruff/)                                   | "An extremely fast Python linter and code formatter, written in Rust" |
+| Tool                                                                        | Description                                             |
+|-----------------------------------------------------------------------------|---------------------------------------------------------|
+| [poetry](https://python-poetry.org/)                                        | "Python dependency management and packaging made easy"  |
+| [Py.Test](https://pytest.org)                                               | "A mature full-featured Python testing tool"            |
+| [flake8](https://flake8.pycqa.org/)                                         | "Your tool for style guide enforcement" |
 
 ---
 
@@ -33,4 +33,4 @@ make test
 
 This repository is created and maintained by the team and the community of Hexlet, an educational project. [Read more about Hexlet](https://hexlet.io/?utm_source=github&utm_medium=link&utm_campaign=python-package).
 
-See most active contributors on [hexlet-friends](https://friends.hexlet.io/).
+See most active contributors on [hexlet-friends](https://friends.hexlet.io/).

poetry.lock

@@ -1,19 +1,12 @@
-[project]
-authors = [
-    {name = "Hexlet team", email = "[email protected]"},
-]
-requires-python = "<4.0,>=3.12"
-name = "python-example-app"
-version = "0.1.0"
-description = "Example application"
+[tool.poetry]
+name = "hexlet-python-package"
+version = "0.3.0"
+description = ""
+authors = ["skip"]
 readme = "README.md"
 
-[tool.uv]
-dev-dependencies = [
-    "ruff>=0.7.1",
-    "pytest>=8.3.3",
-    "pytest-cov>=5.0.0",
-]
+[tool.poetry.dependencies]
+python = ">=3.8.1,<4.0"
 
 [project.scripts]
 hexlet-python-package = "hexlet_python_package.scripts.main:main"