Skip to content

Commit 55d56e6

Browse files
Подключение setuptools_scm, небольшие фиксы
1 parent 0968add commit 55d56e6

File tree

6 files changed

+31
-11
lines changed

6 files changed

+31
-11
lines changed

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[flake8]
2-
max-line-length = 120
2+
max-line-length = 100

.gitignore

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
# Build artifacts
2+
/vkms/version.py
3+
build/
4+
*.egg-info
5+
dist/
6+
7+
# Python cache
18
__pycache__/
29
*.pyc
10+
11+
# Backups and sketches
312
other/
4-
*.json
13+
14+
# Program artifacts
515
vkms-result*
6-
build/
7-
*.egg-info
8-
dist/
16+
*.json

.pre-commit-config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ repos:
1010
- id: check-toml
1111
- id: end-of-file-fixer
1212
- id: trailing-whitespace
13-
- id: requirements-txt-fixer
1413

1514
- repo: https://github.com/PyCQA/isort
1615
rev: 5.10.1

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ pip install vkms
4545

4646
- Сохранять переписки в программном формате (JSON), доступна многопоточная загрузка (`vkms dump`)
4747
- Сохранять переписки в удобном для чтения формате (`vkms parse`)
48+
- TXT, за основу была взята структура формата [hikiko4ern'а](https://github.com/hikiko4ern/vk_dump)
49+
- HTML, кастомная верстка, максимально приближенная к официальному приложению VK Android
4850
- Загружать вложения, доступна многопоточная загрузка (`vkms atch`)
4951
- Фото
5052
- Документы

pyproject.toml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools"]
2+
requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
33
build-backend = "setuptools.build_meta"
44

55
[project]
@@ -14,7 +14,7 @@ dependencies = [
1414
"requests~=2.24",
1515
"Jinja2~=3.1",
1616
"minify-html~=0.8",
17-
"vk>=3.0.dev"
17+
"vk>=3.0"
1818
]
1919
urls.Homepage = "https://github.com/YariKartoshe4ka/vk-messages-saver"
2020
readme = "README.md"
@@ -46,5 +46,11 @@ version = {attr = "vkms.__version__"}
4646
[tool.setuptools.package-data]
4747
vkms = ["templates/*.html"]
4848

49-
[tool.flake8]
50-
max-line-length = 100
49+
[tool.setuptools_scm]
50+
write_to = "vkms/version.py"
51+
write_to_template = '''
52+
"""Version information"""
53+
54+
__version__ = '{version}'
55+
__version_tuple__ = {version_tuple}
56+
'''

vkms/__init__.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
__version__ = '0.1.0'
1+
from .version import __version__, __version_tuple__
2+
3+
__all__ = (
4+
__version__,
5+
__version_tuple__
6+
)

0 commit comments

Comments
 (0)