Skip to content

Commit

Permalink
Move development from master to devel
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexandreDecan committed Feb 8, 2016
1 parent 4c41952 commit f5cda86
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ deploy:
password:
secure: SNcWHKnxF5ZVEEzXYHci1yyA9BivCUsDuDgZUT+b4h7YXcxBZVvWKJcxA9d5e+Hc3q/6l/Ij1RII5C4fRG7OtBlJSb3sdNgX2MQc9Dd1DAyn5XHijFNbieJ8C9nuXMNFwjDkeNw1IQHm1F6bvyTBQkURF2DnuYNQLOpuP4T9lKeVVRbx/ido1Q1BQTmDHoNW2tTlyTP6XSssW7gBfOSqnH/u8lytpGLREGkMwJ42hcNgR+dTZjKVVMDxOUYQeYrK5mLbHowj97YDThDQR1qs5dxq2EtVVKjHLPQU/MOI+q74fNQWzi8OY6Yr8M52uE7sRyczQzjdCiO/Bb1i1nI+yBxVoPjo9gPM5JVSKTdc6NGqTRurSasst72VuYzj7Fqlof+eJuzHgrhZRXOcD/duiQrCqLVv0y9trQnElWO1+geqsbgouMSoFmVPiIlxOJ1zmMvtDB3Q4g2vmtGjbPzfgxb9Hq7iFcd7FewwYFhpzSY/GddosDQ9wZRCKE0Rs/xBCxmy1cXtwepe4qz4NRSm1zcWu/7LgWj7ka2BpnTAR6CNxWFUrlEPkHzfZH2ZvHBcrN9tLFEg5prmj/55aMpLEo8f6B6+l4RO2cESUe7pObyxmAtMwYr/aQ8VZfYFwRggBfhtVIlHWPDet28+9swu69e3J2ViScM+AOOBXt+qNgc=
on:
branch: stable
branch: master
python: '3.4'
10 changes: 5 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Sismic for Python
:target: https://www.codacy.com/app/alexandre-decan/sismic
.. image:: https://badge.fury.io/py/sismic.svg
:target: https://pypi.python.org/pypi/sismic
.. image:: https://readthedocs.org/projects/sismic/badge/?version=stable
:target: https://sismic.readthedocs.org/en/stable
.. image:: https://readthedocs.org/projects/sismic/badge/?version=master
:target: https://sismic.readthedocs.org/

Sismic Interactive State Machine Interpreter and Checker
--------------------------------------------------------
Expand All @@ -35,7 +35,7 @@ Sismic can be installed using ``pip`` as usual: ``pip install sismic``.
This will install the latest stable version.

You can also install Sismic from this repository by cloning it.
The development occurs in the *master* branch, the latest stable distributed version is in the *stable* branch.
The development occurs in the *devel* branch, the latest stable distributed version is in the *master* branch.

Sismic requires Python >=3.4

Expand All @@ -52,8 +52,8 @@ The documentation can also be directly built from the `docs <https://github.com/
Changelog
---------

See documentation's `changelog <http://sismic.readthedocs.org/en/stable/changelog.html>`_.
Unreleased changes are visible `here <CHANGELOG.rst>`_.
See documentation's `changelog <http://sismic.readthedocs.org/en/master/changelog.html>`_.
Unreleased changes are visible `here <https://github.com/AlexandreDecan/sismic/tree/devel/CHANGELOG.rst>`_.

Credits
-------
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Sismic user manual
:target: https://www.codacy.com/app/alexandre-decan/sismic
.. image:: https://badge.fury.io/py/sismic.svg
:target: https://pypi.python.org/pypi/sismic
.. image:: https://readthedocs.org/projects/sismic/badge/?version=stable
:target: https://sismic.readthedocs.org/en/stable
.. image:: https://readthedocs.org/projects/sismic/badge/?version=master
:target: https://sismic.readthedocs.org/

About
-----
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ From GitHub
-----------

You can also install Sismic from its repository by cloning it.
The development occurs in the *master* branch, the latest stable distributed version is in the *stable* branch.
The development occurs in the *devel* branch, the latest stable distributed version is in the *master* branch.

1. Get the tool to create virtual environments: ``pip install virtualenv``
2. Create the environment: ``virtualenv -p python3.4 env``
Expand Down

0 comments on commit f5cda86

Please sign in to comment.