Merge branch 'develop' of https://github.com/mopidy/mopidy into fix/310-persist-mopidy-state-between-runs

This commit is contained in:
Jens Luetjen 2016-02-06 14:06:23 +01:00
commit df55c3ebd9
4 changed files with 6 additions and 6 deletions

View File

@ -5,7 +5,7 @@ Changelog
This changelog is used to track all major changes to Mopidy.
v1.2.0 (UNRELEASED)
v2.0.0 (UNRELEASED)
===================
Feature release.
@ -13,8 +13,8 @@ Feature release.
Dependencies
------------
- Mopidy now requires GStreamer 1.x, as we've finally ported from GStreamer
0.10.
- Mopidy now requires GStreamer >= 1.2.3, as we've finally ported from
GStreamer 0.10.
Core API
--------

View File

@ -37,7 +37,7 @@ please follow the directions :ref:`here <contributing>`.
On Fedora Linux, you must replace ``pip`` with ``pip-python`` in the
following steps.
#. Then you'll need to install GStreamer 1.x (>= 1.2), with Python bindings.
#. Then you'll need to install GStreamer >= 1.2.3, with Python bindings.
GStreamer is packaged for most popular Linux distributions. Search for
GStreamer in your package manager, and make sure to install the Python
bindings, and the "good" and "ugly" plugin sets.

View File

@ -14,4 +14,4 @@ if not (2, 7) <= sys.version_info < (3,):
warnings.filterwarnings('ignore', 'could not open display')
__version__ = '1.1.2'
__version__ = '2.0.0'

View File

@ -25,7 +25,7 @@ else:
Gst.is_initialized() or Gst.init()
REQUIRED_GST_VERSION = (1, 2)
REQUIRED_GST_VERSION = (1, 2, 3)
if Gst.version() < REQUIRED_GST_VERSION:
sys.exit(