and others added 29 commits

August 11, 2021 08:44

…ryptionError (#2621)
* move telegramdecryptionerror to error.py
* Change error class name

* feat: add docs about docs
* fix: improve looks
* fix: make link work
* fix: this looks better
* Improved markdown, updated link
* Less justifying
Co-authored-by: Bibo-Joshi <22366557+Bibo-Joshi@users.noreply.github.com>

* Fix incomplete type annotations for CallbackContext
Co-authored-by: Hinrich Mahler <22366557+Bibo-Joshi@users.noreply.github.com>

* Feat: Custom pytest marker
Co-authored-by: Bibo-Joshi <22366557+Bibo-Joshi@users.noreply.github.com>

* Make basepersistence methods abstractmethod
Signed-off-by: starry69 <starry369126@outlook.com>
Co-authored-by: Hinrich Mahler <22366557+Bibo-Joshi@users.noreply.github.com>

Co-authored-by: Hinrich Mahler <22366557+Bibo-Joshi@users.noreply.github.com>

# Conflicts:
#	telegram/ext/conversationhandler.py
#	telegram/ext/dispatcher.py
#	telegram/ext/updater.py
#	tests/conftest.py
#	tests/test_dispatcher.py
#	tests/test_jobqueue.py
#	tests/test_persistence.py
#	tests/test_updater.py

# Conflicts:
#	telegram/ext/__init__.py
#	telegram/ext/dispatcher.py
#	telegram/utils/promise.py

# Conflicts:
#	telegram/ext/__init__.py
#	telegram/ext/callbackcontext.py
#	telegram/ext/conversationhandler.py
#	telegram/ext/dispatcher.py
#	telegram/ext/jobqueue.py
#	telegram/ext/updater.py
#	tests/conftest.py
#	tests/test_dispatcher.py
#	tests/test_jobqueue.py
#	tests/test_persistence.py
#	tests/test_updater.py

Co-authored-by: Harshil <37377066+harshil21@users.noreply.github.com>

# Conflicts:
#	telegram/ext/jobqueue.py

Co-authored-by: Harshil <37377066+harshil21@users.noreply.github.com>

# Conflicts:
#	examples/deeplinking.py
#	examples/inlinebot.py
#	telegram/ext/dispatcher.py
#	telegram/ext/updater.py
#	tests/conftest.py
#	tests/test_dispatcher.py
#	tests/test_updater.py

# Conflicts:
#	telegram/bot.py
#	telegram/ext/__init__.py
#	telegram/ext/callbackcontext.py
#	telegram/ext/conversationhandler.py
#	telegram/ext/dispatcher.py
#	telegram/ext/extbot.py
#	telegram/ext/jobqueue.py
#	telegram/ext/updater.py
#	tests/conftest.py
#	tests/test_bot.py
#	tests/test_dispatcher.py
#	tests/test_jobqueue.py
#	tests/test_persistence.py
#	tests/test_stack.py
#	tests/test_updater.py

Merged

4 tasks

# Conflicts:
#	examples/passportbot.py
#	examples/persistentconversationbot.py

# Conflicts:
#	telegram/ext/updater.py

Merged