Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
sgmdlt committed Dec 11, 2024
2 parents c6bd4fb + 99baec4 commit abd1d13
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 264 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/pyci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
# make depends on poetry
python-version: '3.12'
# make depends on uv
- name: Install dependencies
run: |
pip install poetry
pip install uv
make install
- name: Run linter and pytest
run: |
make check
- name: Test & publish code coverage
uses: paambaati/codeclimate-action@v5.0.0
uses: paambaati/codeclimate-action@v9.0.0
if: github.ref_name == 'main'
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
Expand Down
17 changes: 7 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
install:
poetry install
uv sync

run:
uv run hexlet-python-package

test:
poetry run pytest
uv run pytest

test-coverage:
poetry run pytest --cov=hexlet_python_package --cov-report xml
uv run pytest --cov=hexlet_python_package --cov-report xml

lint:
poetry run flake8 hexlet_python_package
uv run ruff check

selfcheck:
poetry check
check: test lint

check: selfcheck test lint

build: check
poetry build
build:
uv build

.PHONY: install test lint selfcheck check build
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

This project was built using these tools:

| 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" |
| 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" |

---

Expand All @@ -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/).
234 changes: 0 additions & 234 deletions poetry.lock

This file was deleted.

21 changes: 14 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
[tool.poetry]
name = "hexlet-python-package"
version = "0.3.0"
description = ""
authors = ["skip"]
[project]
authors = [
{name = "Hexlet team", email = "team@hexlet.io"},
]
requires-python = "<4.0,>=3.12"
name = "python-example-app"
version = "0.1.0"
description = "Example application"
readme = "README.md"

[tool.poetry.dependencies]
python = ">=3.8.1,<4.0"
[tool.uv]
dev-dependencies = [
"ruff>=0.7.1",
"pytest>=8.3.3",
"pytest-cov>=5.0.0",
]

[project.scripts]
hexlet-python-package = "hexlet_python_package.scripts.main:main"
Expand Down
1 change: 0 additions & 1 deletion uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit abd1d13

Please sign in to comment.