Merge upstream AutoShop-Djimbo: resolve .gitignore and README conflicts

This commit is contained in:
2026-07-15 07:21:15 +05:00
2 changed files with 91 additions and 60 deletions
+73 -60
View File
@@ -1,3 +1,4 @@
# ---> Python
# Byte-compiled / optimized / DLL files # Byte-compiled / optimized / DLL files
__pycache__/ __pycache__/
*.py[cod] *.py[cod]
@@ -9,7 +10,6 @@ __pycache__/
# Distribution / packaging # Distribution / packaging
.Python .Python
env/
build/ build/
develop-eggs/ develop-eggs/
dist/ dist/
@@ -21,13 +21,14 @@ lib64/
parts/ parts/
sdist/ sdist/
var/ var/
wheels/
share/python-wheels/
*.egg-info/ *.egg-info/
.installed.cfg .installed.cfg
*.egg *.egg
MANIFEST
# PyInstaller # PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest *.manifest
*.spec *.spec
@@ -38,13 +39,17 @@ pip-delete-this-directory.txt
# Unit test / coverage reports # Unit test / coverage reports
htmlcov/ htmlcov/
.tox/ .tox/
.nox/
.coverage .coverage
.coverage.* .coverage.*
.cache .cache
nosetests.xml nosetests.xml
coverage.xml coverage.xml
*,cover *.cover
*.py,cover
.hypothesis/ .hypothesis/
.pytest_cache/
cover/
# Translations # Translations
*.mo *.mo
@@ -53,6 +58,8 @@ coverage.xml
# Django stuff: # Django stuff:
*.log *.log
local_settings.py local_settings.py
db.sqlite3
db.sqlite3-journal
# Flask stuff: # Flask stuff:
instance/ instance/
@@ -65,32 +72,84 @@ instance/
docs/_build/ docs/_build/
# PyBuilder # PyBuilder
.pybuilder/
target/ target/
# IPython Notebook # Jupyter Notebook
.ipynb_checkpoints .ipynb_checkpoints
# IPython
profile_default/
ipython_config.py
# pyenv # pyenv
.python-version .python-version
# celery beat schedule file # pipenv
#Pipfile.lock
# UV
#uv.lock
# poetry
#poetry.lock
# pdm
#pdm.lock
.pdm.toml
.pdm-python
.pdm-build/
# PEP 582
__pypackages__/
# Celery stuff
celerybeat-schedule celerybeat-schedule
celerybeat.pid
# dotenv # SageMath parsed files
*.sage.py
# Environments
.env .env
.venv
# virtualenv env/
venv/ venv/
ENV/ ENV/
env.bak/
venv.bak/
# Spyder project settings # Spyder project settings
.spyderproject .spyderproject
.spyproject
# Rope project settings # Rope project settings
.ropeproject .ropeproject
### VirtualEnv template
# Virtualenv # mkdocs documentation
# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/ /site
# mypy
.mypy_cache/
.dmypy.json
dmypy.json
# Pyre type checker
.pyre/
# pytype static type analyzer
.pytype/
# Cython debug symbols
cython_debug/
# Ruff stuff:
.ruff_cache/
# PyPI configuration file
.pypirc
# ---> VirtualEnv
[Bb]in [Bb]in
[Ii]nclude [Ii]nclude
[Ll]ib [Ll]ib
@@ -98,27 +157,16 @@ ENV/
[Ll]ocal [Ll]ocal
[Ss]cripts [Ss]cripts
pyvenv.cfg pyvenv.cfg
.venv
pip-selfcheck.json pip-selfcheck.json
### JetBrains template # ---> JetBrains
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff
.idea/**/workspace.xml .idea/**/workspace.xml
.idea/**/tasks.xml .idea/**/tasks.xml
.idea/**/usage.statistics.xml .idea/**/usage.statistics.xml
.idea/**/dictionaries .idea/**/dictionaries
.idea/**/shelf .idea/**/shelf
# AWS User-specific
.idea/**/aws.xml .idea/**/aws.xml
# Generated files
.idea/**/contentModel.xml .idea/**/contentModel.xml
# Sensitive or high-churn files
.idea/**/dataSources/ .idea/**/dataSources/
.idea/**/dataSources.ids .idea/**/dataSources.ids
.idea/**/dataSources.local.xml .idea/**/dataSources.local.xml
@@ -126,15 +174,8 @@ pip-selfcheck.json
.idea/**/dynamic.xml .idea/**/dynamic.xml
.idea/**/uiDesigner.xml .idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml .idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml .idea/**/gradle.xml
.idea/**/libraries .idea/**/libraries
# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
auto-import.
.idea/artifacts .idea/artifacts
.idea/compiler.xml .idea/compiler.xml
.idea/jarRepositories.xml .idea/jarRepositories.xml
@@ -143,47 +184,23 @@ auto-import.
.idea/modules .idea/modules
*.iml *.iml
*.ipr *.ipr
# CMake
cmake-build-*/ cmake-build-*/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml .idea/**/mongoSettings.xml
# File-based project format
*.iws *.iws
# IntelliJ
out/ out/
# mpeltonen/sbt-idea plugin
.idea_modules/ .idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml .idea/replstate.xml
# SonarLint plugin
.idea/sonarlint/ .idea/sonarlint/
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml com_crashlytics_export_strings.xml
crashlytics.properties crashlytics.properties
crashlytics-build.properties crashlytics-build.properties
fabric.properties fabric.properties
# Editor-based Rest Client
.idea/httpRequests .idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser .idea/caches/build_file_checksums.ser
# idea folder, uncomment if you don't need it
.idea .idea
# Users exceptions # ---> Project-specific
/other/ /other/
/tgbot/data/database /tgbot/data/database
/tgbot/data/database.db /tgbot/data/database.db
@@ -202,16 +219,12 @@ database.db
.env.* .env.*
!.env.example !.env.example
.vscode/ .vscode/
.pytest_cache/
.mypy_cache/
.ruff_cache/
*.db *.db
*.db-journal *.db-journal
*.db-shm *.db-shm
*.db-wal *.db-wal
*.sqlite *.sqlite
*.sqlite3 *.sqlite3
*.log
tgbot/data/*.db* tgbot/data/*.db*
tgbot/data/*.sqlite* tgbot/data/*.sqlite*
tgbot/data/*.log tgbot/data/*.log
+18
View File
@@ -0,0 +1,18 @@
MIT License
Copyright (c) 2026 FOSS
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial
portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
USE OR OTHER DEALINGS IN THE SOFTWARE.