Skip to content

Commit 60cd7cd

Browse files
committed
Merge branch 'main' into feat-fansites
2 parents 067c737 + 8b164c7 commit 60cd7cd

File tree

13 files changed

+61
-210
lines changed

13 files changed

+61
-210
lines changed

.github/workflows/analyze.yml

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Analyze
1+
name: 🔎 Analyze
22
on:
33
push:
44
branches:
@@ -9,26 +9,24 @@ on:
99

1010
jobs:
1111
build:
12-
name: Test & Analyze
12+
name: 🧪 Test & Analyze
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout 🚚
1616
uses: actions/checkout@v4.1.1
1717
with:
1818
fetch-depth: 1
1919
- name: Set up Python 🐍
20-
uses: actions/setup-python@v5.0.0
20+
uses: actions/setup-python@v5.1.0
2121
with:
22-
python-version: 3.9
22+
python-version: 3.12
2323
- name: Install dependencies ⚙️
2424
run: |
2525
python -m pip install --upgrade pip
2626
pip install -U -e .[testing,linting]
2727
- name: Test with Coverage 🔧
2828
run: |
2929
coverage run
30-
- name: Anaylze with Flake8 ❄️
31-
run: flake8 --output-file=flake8.txt --exit-zero
3230
- name: Anaylze with Ruff ⚡️
3331
run: ruff check --output-format json --output-file ruff.json --exit-zero .
3432
- name: Generate Coverage Reports 📋
@@ -40,7 +38,6 @@ jobs:
4038
with:
4139
name: reports
4240
path: |
43-
flake8.txt
4441
ruff.json
4542
coverage.xml
4643
sonarcloud:
@@ -61,17 +58,3 @@ jobs:
6158
env:
6259
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6360
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
64-
codecov:
65-
name: CodeCov
66-
runs-on: ubuntu-latest
67-
needs: build
68-
steps:
69-
- name: Download reports 📥
70-
uses: actions/download-artifact@v4.1.4
71-
with:
72-
name: reports
73-
- name: Upload to Codecov ☂️
74-
uses: codecov/codecov-action@v4.1.0
75-
with:
76-
file: ./coverage.xml
77-
verbose: true

.github/workflows/build.yml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
1-
name: Build
1+
name: ⚙️ Build
22

3-
on: [push]
3+
on: [ push ]
44

55
jobs:
66
build:
7-
7+
name: ⚙️🧪 Build and test
88
runs-on: ubuntu-latest
99
strategy:
1010
max-parallel: 4
1111
matrix:
12-
python-version: ["3.8", "3.9", "3.10", "3.11"]
12+
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
1313
steps:
14-
- uses: actions/checkout@v1
15-
- name: Set up Python ${{ matrix.python-version }}
16-
uses: actions/setup-python@v5.0.0
17-
with:
18-
python-version: ${{ matrix.python-version }}
19-
- name: Install dependencies
20-
run: |
21-
python -m pip install --upgrade pip
22-
pip install -U -e .[testing]
23-
- name: Test
24-
run: |
25-
python -m unittest discover
14+
- name: Checkout 🚚
15+
uses: actions/checkout@v4.1.1
16+
with:
17+
fetch-depth: 1
18+
- name: Set up Python ${{ matrix.python-version }} 🐍
19+
uses: actions/setup-python@v5.1.0
20+
with:
21+
python-version: ${{ matrix.python-version }}
22+
- name: Install dependencies ⚙️
23+
run: |
24+
python -m pip install --upgrade pip
25+
pip install -U -e .[testing]
26+
- name: Test 🧪
27+
run: |
28+
python -m unittest discover

.github/workflows/deploy.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Deploy
1+
name: 🚀 Deploy
22

33
on:
44
push:
@@ -7,22 +7,23 @@ on:
77

88
jobs:
99
build-n-publish:
10-
name: Build and publish
10+
name: ⚙️🚀 Build and publish
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@master
14-
- name: Set up Python 3.9 🐍
15-
uses: actions/setup-python@v5.0.0
13+
- name: Checkout 🚚
14+
uses: actions/checkout@v4.1.1
15+
- name: Set up Python 3.12 🐍
16+
uses: actions/setup-python@v5.1.0
1617
with:
17-
python-version: 3.9
18+
python-version: 3.12
1819
- name: Install dependencies ⚙️
1920
run: |
2021
python -m pip install wheel twine build
2122
- name: Build Package 📦
2223
run: |
2324
python -m build
2425
- name: Publish to PyPi 🚀
25-
uses: pypa/gh-action-pypi-publish@release/v1
26+
uses: pypa/gh-action-pypi-publish@v1.8.14
2627
with:
2728
user: __token__
2829
password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/docker.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Docker Build
1+
name: 🐋 Docker Build
22

33
on:
44
push:
@@ -10,11 +10,11 @@ on:
1010

1111
jobs:
1212
build:
13-
name: Build and Publish Images
13+
name: ⚙️🐋 Build and Publish Images
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Cache Docker Layers 📦
17-
uses: actions/cache@v3.3.1
17+
uses: actions/cache@v4.0.2
1818
with:
1919
path: /tmp/.buildx-cache
2020
key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: Docker Meta 📋
2727
id: meta
28-
uses: docker/metadata-action@v4.6.0
28+
uses: docker/metadata-action@v5.5.1
2929
with:
3030
images: |
3131
ghcr.io/${{ github.repository }}
@@ -44,19 +44,19 @@ jobs:
4444
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
4545

4646
- name: Login to GHCR 🐙
47-
uses: docker/login-action@v2.2.0
47+
uses: docker/login-action@v3.1.0
4848
with:
4949
registry: ghcr.io
5050
username: ${{ github.repository_owner }}
5151
password: ${{ secrets.GITHUB_TOKEN }}
5252

5353
- name: Set up Docker Buildx 🐋
5454
id: buildx
55-
uses: docker/setup-buildx-action@v2.9.1
55+
uses: docker/setup-buildx-action@v3.2.0
5656

5757
- name: Build and Push 🚀
5858
id: docker_build
59-
uses: docker/build-push-action@v4.1.1
59+
uses: docker/build-push-action@v5.3.0
6060
with:
6161
context: ./
6262
file: ./Dockerfile

.github/workflows/pages_deploy.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
name: Publish docs via GitHub Pages
1+
name: 🐙 Publish to Github Pages
22
on:
33
push:
44
branches:
55
- main
66

77
jobs:
88
build:
9-
name: Deploy docs
9+
name: 📄 Deploy Docs
1010
runs-on: ubuntu-latest
1111
steps:
12-
- name: Checkout
13-
uses: actions/checkout@v1
12+
- name: Checkout 🚚
13+
uses: actions/checkout@v4.1.1
1414

15-
- name: Set up Python
16-
uses: actions/setup-python@v5.0.0
15+
- name: Set up Python 🐍
16+
uses: actions/setup-python@v5.1.0
1717
with:
18-
python-version: 3.9
18+
python-version: 3.12
1919

20-
- name: Install dependencies
20+
- name: Install dependencies ⚙️
2121
run: |
2222
pip install -U -e .[docs]
2323
24-
- name: Build Sphinx Documentation
24+
- name: Build Sphinx Documentation 📄
2525
run: |
2626
cd docs
2727
make html
2828
2929
- name: Deploy 🚀
30-
uses: JamesIves/github-pages-deploy-action@4.0.0
30+
uses: JamesIves/github-pages-deploy-action@v4.5.0
3131
with:
3232
branch: gh-pages
3333
folder: docs/_build/html

.github/workflows/qodana_code_quality.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.run/flake8 (HTML).run.xml

Lines changed: 0 additions & 24 deletions
This file was deleted.

README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,18 @@ An API to parse Tibia.com content into object oriented data.
33

44
No fetching is done by this module, you must provide the html content.
55

6-
![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/Galarzaa90/tibia.py/build.yml)
7-
[![codecov](https://codecov.io/gh/Galarzaa90/tibia.py/branch/master/graph/badge.svg?token=mS9Wxv6O2F)](https://codecov.io/gh/Galarzaa90/tibia.py)
86
[![PyPI](https://img.shields.io/pypi/v/tibia.py.svg)](https://pypi.python.org/pypi/tibia.py/)
7+
![GitHub commits since latest release (branch)](https://img.shields.io/github/commits-since/Galarzaa90/tibia.py/latest/main)
98
![PyPI - Python Version](https://img.shields.io/pypi/pyversions/tibia.py.svg)
109
![PyPI - License](https://img.shields.io/pypi/l/tibia.py.svg)
11-
10+
![PyPI - Downloads](https://img.shields.io/pypi/dm/tibia.py)
11+
12+
[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=Galarzaa90_tibia.py&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=Galarzaa90_tibia.py)
13+
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=Galarzaa90_tibia.py&metric=coverage)](https://sonarcloud.io/summary/new_code?id=Galarzaa90_tibia.py)
14+
[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=Galarzaa90_tibia.py&metric=ncloc)](https://sonarcloud.io/summary/new_code?id=Galarzaa90_tibia.py)
15+
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=Galarzaa90_tibia.py&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=Galarzaa90_tibia.py)
16+
[![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=Galarzaa90_tibia.py&metric=sqale_index)](https://sonarcloud.io/summary/new_code?id=Galarzaa90_tibia.py)
17+
[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=Galarzaa90_tibia.py&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=Galarzaa90_tibia.py)
1218

1319
**Features:**
1420

pyproject.toml

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ classifiers = [
3434
'Programming Language :: Python :: 3.9',
3535
'Programming Language :: Python :: 3.10',
3636
'Programming Language :: Python :: 3.11',
37+
'Programming Language :: Python :: 3.12',
3738
'Programming Language :: Python',
3839
'Topic :: Games/Entertainment :: Role-Playing',
3940
'Topic :: Internet',
@@ -91,57 +92,6 @@ exclude_also = [
9192
]
9293

9394

94-
[tool.flake8]
95-
max-line-length = 120
96-
exclude = [
97-
"__pycache__",
98-
".git/",
99-
"build/",
100-
".idea/",
101-
"venv/",
102-
"docs/",
103-
"logs/",
104-
"tests/",
105-
]
106-
tee = true
107-
# Ignore unused imports in __INIT__.py files
108-
per-file-ignores = [
109-
"**/__init__.py:F401, F403",
110-
"server.py:D103,B008,TC002",
111-
"**/builders/*:D101",
112-
]
113-
count = true
114-
ignore = [
115-
# flake8-docstrings: Missing docstring in public module
116-
"D100",
117-
# flake8-docstrings: Missing docstring in public method
118-
"D102",
119-
# flake8-docstrings: Missing docstring in public package
120-
"D104",
121-
# flake8-docstrings: Missing docstring in magic method
122-
"D105",
123-
# flake8-docstrings: Missing docstring in __init__
124-
"D107",
125-
# flake8: line break before binary operator
126-
"W503",
127-
# flake8: line too long (121 > 120 characters)
128-
"E501",
129-
]
130-
rst-roles = [
131-
"class",
132-
"py:attr",
133-
"obj",
134-
"meth",
135-
"attr",
136-
"exc",
137-
]
138-
rst-directives = [
139-
"versionadded",
140-
"versionchanged",
141-
]
142-
literal-inline-quotes = "double"
143-
type-checking-pydantic-enabled = true
144-
14595
[tool.ruff]
14696
exclude = [
14797
"__pycache__",

0 commit comments

Comments
 (0)