Skip to content

Commit 74f58cc

Browse files
committed
Merge remote-tracking branch 'remotes/origin/master' into extract-urls
# Conflicts: # telegram/utils/helpers.py
2 parents ee20220 + 8690ba2 commit 74f58cc

File tree

220 files changed

+1489
-424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+1489
-424
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: python
22
python:
33
- "2.7"
4-
- "3.3"
54
- "3.4"
65
- "3.5"
76
- "3.6"

AUTHORS.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ The following wonderful people contributed directly or indirectly to this projec
2222
- `bimmlerd <https://github.com/bimmlerd>`_
2323
- `d-qoi <https://github.com/d-qoi>`_
2424
- `daimajia <https://github.com/daimajia>`_
25+
- `Daniel Reed <https://github.com/nmlorg>`_
2526
- `Eli Gao <https://github.com/eligao>`_
2627
- `ErgoZ Riftbit Vaper <https://github.com/ergoz>`_
2728
- `Eugene Lisitsky <https://github.com/lisitsky>`_
@@ -44,6 +45,7 @@ The following wonderful people contributed directly or indirectly to this projec
4445
- `Li-aung Yip <https://github.com/LiaungYip>`_
4546
- `macrojames <https://github.com/macrojames>`_
4647
- `Michael Elovskikh <https://github.com/wronglink>`_
48+
- `Mischa Krüger <https://github.com/Makman2>`_
4749
- `naveenvhegde <https://github.com/naveenvhegde>`_
4850
- `neurrone <https://github.com/neurrone>`_
4951
- `njittam <https://github.com/njittam>`_
@@ -55,6 +57,7 @@ The following wonderful people contributed directly or indirectly to this projec
5557
- `Rahiel Kasim <https://github.com/rahiel>`_
5658
- `Sascha <https://github.com/saschalalala>`_
5759
- `Shelomentsev D <https://github.com/shelomentsevd>`_
60+
- `Simon Schürrle <https://github.com/SitiSchu>`_
5861
- `sooyhwang <https://github.com/sooyhwang>`_
5962
- `thodnev <https://github.com/thodnev>`_
6063
- `Valentijn <https://github.com/Faalentijn>`_

CHANGES.rst

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,57 @@
11
=======
22
Changes
33
=======
4+
**2017-12-08**
5+
*Released 9.0.0*
6+
7+
Breaking changes (possibly)
8+
9+
- Drop support for python 3.3 (PR `#930`_)
10+
11+
12+
New Features
13+
14+
- Support Bot API 3.5 (PR `#920`_)
15+
16+
17+
Changes
18+
19+
- Fix race condition in dispatcher start/stop (`#887`_)
20+
- Log error trace if there is no error handler registered (`#694`_)
21+
- Update examples with consistent string formatting (`#870`_)
22+
- Various changes and improvements to the docs.
23+
24+
.. _`#920`: https://github.com/python-telegram-bot/python-telegram-bot/pull/920
25+
.. _`#930`: https://github.com/python-telegram-bot/python-telegram-bot/pull/930
26+
.. _`#887`: https://github.com/python-telegram-bot/python-telegram-bot/pull/887
27+
.. _`#694`: https://github.com/python-telegram-bot/python-telegram-bot/pull/694
28+
.. _`#870`: https://github.com/python-telegram-bot/python-telegram-bot/pull/870
29+
30+
**2017-10-15**
31+
*Released 8.1.1*
32+
33+
- Fix Commandhandler crashing on single character messages (PR `#873`_).
34+
35+
.. _`#873`: https://github.com/python-telegram-bot/python-telegram-bot/pull/871
36+
37+
**2017-10-14**
38+
*Released 8.1.0*
39+
40+
New features
41+
- Support Bot API 3.4 (PR `#865`_).
42+
43+
Changes
44+
- MessageHandler & RegexHandler now consider channel_updates.
45+
- Fix command not recognized if it is directly followed by a newline (PR `#869`_).
46+
- Removed Bot._message_wrapper (PR `#822`_).
47+
- Unitests are now also running on AppVeyor (Windows VM).
48+
- Various unitest improvements.
49+
- Documentation fixes.
50+
51+
.. _`#822`: https://github.com/python-telegram-bot/python-telegram-bot/pull/822
52+
.. _`#865`: https://github.com/python-telegram-bot/python-telegram-bot/pull/865
53+
.. _`#869`: https://github.com/python-telegram-bot/python-telegram-bot/pull/869
54+
455
**2017-09-01**
556
*Released 8.0.0*
657

@@ -26,7 +77,7 @@ Changes
2677
- Warn on small con_pool_size during custom initalization of Updater (PR `#793`_).
2778
- Catch exceptions in error handlerfor errors that happen during polling (PR `#810`_).
2879
- For testing we switched to pytest (PR `#788`_).
29-
- Lot's of small improvements to our tests and documentation.
80+
- Lots of small improvements to our tests and documentation.
3081

3182

3283
.. _`see docs`: http://python-telegram-bot.readthedocs.io/en/stable/telegram.ext.dispatcher.html#telegram.ext.Dispatcher.add_handler

CODE_OF_CONDUCT.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Publication of any content supporting, justifying or otherwise affiliating with terror and/or hate towards others
21+
* Trolling, insulting/derogatory comments, and personal or political attacks
22+
* Public or private harassment
23+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
24+
* Other conduct which could reasonably be considered inappropriate in a professional setting
25+
26+
## Our Responsibilities
27+
28+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
29+
30+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
31+
32+
## Scope
33+
34+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
35+
36+
## Enforcement
37+
38+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at devs@python-telegram-bot.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
39+
40+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
41+
42+
## Attribution
43+
44+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
45+
46+
[homepage]: http://contributor-covenant.org
47+
[version]: http://contributor-covenant.org/version/1/4/

README.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ We have made you a wrapper you can't refuse
3131
:target: https://travis-ci.org/python-telegram-bot/python-telegram-bot
3232
:alt: Travis CI Status
3333

34+
.. image:: https://img.shields.io/appveyor/ci/Eldinnie/python-telegram-bot/master.svg?logo=appveyor
35+
:target: https://ci.appveyor.com/project/Eldinnie/python-telegram-bot
36+
:alt: AppVeyor CI Status
37+
3438
.. image:: https://codeclimate.com/github/python-telegram-bot/python-telegram-bot/badges/gpa.svg
3539
:target: https://codeclimate.com/github/python-telegram-bot/python-telegram-bot
3640
:alt: Code Climate
@@ -47,6 +51,10 @@ We have made you a wrapper you can't refuse
4751
:target: https://telegram.me/pythontelegrambotgroup
4852
:alt: Telegram Group
4953

54+
.. image:: https://img.shields.io/badge/IRC-Channel-blue.svg
55+
:target: https://webchat.freenode.net/?channels=##python-telegram-bot
56+
:alt: IRC Bridge
57+
5058
=================
5159
Table of contents
5260
=================
@@ -88,7 +96,7 @@ make the development of bots easy and straightforward. These classes are contain
8896
Telegram API support
8997
====================
9098

91-
As of **23. July 2017**, all types and methods of the Telegram Bot API 3.2 are supported.
99+
All types and methods of the Telegram Bot API 3.4 are supported.
92100

93101
==========
94102
Installing

appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ environment:
77
# isn't covered by this document) at the time of writing.
88

99
- PYTHON: "C:\\Python27"
10-
- PYTHON: "C:\\Python33"
1110
- PYTHON: "C:\\Python34"
1211
- PYTHON: "C:\\Python35"
1312
- PYTHON: "C:\\Python36"

codecov.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
comment:
2+
layout: "diff, files"
3+
behavior: default
4+
require_changes: false

docs/source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@
5050

5151
# General information about the project.
5252
project = u'Python Telegram Bot'
53-
copyright = u'2015-2017, Leandro Toledo'
53+
copyright = u'2015-2018, Leandro Toledo'
5454
author = u'Leandro Toledo'
5555

5656
# The version info for the project you're documenting, acts as replacement for
5757
# |version| and |release|, also used in various other places throughout the
5858
# built documents.
5959
#
6060
# The short X.Y version.
61-
version = '8.0' # telegram.__version__[:3]
61+
version = '9.0' # telegram.__version__[:3]
6262
# The full version, including alpha/beta/rc tags.
63-
release = '8.0.0' # telegram.__version__
63+
release = '9.0.0' # telegram.__version__
6464

6565
# The language for content autogenerated by Sphinx. Refer to documentation
6666
# for a list of supported languages.

docs/source/index.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ objects in the package reflect the types as defined by the `telegram bot api <ht
1212
.. toctree::
1313
telegram
1414

15+
Changelog
16+
---------
17+
18+
.. include:: ..\\..\\CHANGES.rst
1519

1620
Indices and tables
1721
==================
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
telegram.InputMedia
2+
===================
3+
4+
.. autoclass:: telegram.InputMedia
5+
:members:
6+
:show-inheritance:

0 commit comments

Comments
 (0)