fixed conflicts

README.rst

@@ -1,31 +1,36 @@
 xonsh
 =====
 
-.. image:: https://badges.gitter.im/xonsh/xonsh.svg
-   :alt: Join the chat at https://gitter.im/xonsh/xonsh
-   :target: https://gitter.im/xonsh/xonsh?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+.. raw:: html
 
-.. image:: https://img.shields.io/badge/%23xonsh%3Afeneas.org-Matrix-green
-   :alt: Matrix room: #xonsh:feneas.org
-   :target: https://matrix.to/#/#xonsh:feneas.org
+    <p align="center">
+    <b>xonsh</b> is a Python-powered, cross-platform, Unix-gazing shell language and command prompt.
+    </p>
 
-.. image:: https://travis-ci.org/xonsh/xonsh.svg?branch=master
-    :target: https://travis-ci.org/xonsh/xonsh
+    <p align="center">
+    The language is a superset of Python 3.5+ with additional shell primitives. <br>
+    xonsh (pronounced <i>conch</i>) is meant for the daily use of experts and novices alike.
+    </p>
 
-.. image:: https://ci.appveyor.com/api/projects/status/github/xonsh/xonsh?svg=true
-    :target: https://ci.appveyor.com/project/xonsh/xonsh
+    <p align="center">
+    <a href="https://xon.sh/contents.html#installation"><img src="https://raw.githubusercontent.com/xonsh/xonsh/master/docs/_static/xonsh4.png" alt="What is xonsh?"></a>
+    </p>
 
-.. image:: https://circleci.com/gh/xonsh/xonsh.svg?style=shield
-    :target: https://circleci.com/gh/xonsh/xonsh
+    <p align="center">
+    If you like xonsh, :star: the repo and stay tuned by watching releases.
+    </p>
 
-.. image:: https://codecov.io/gh/xonsh/xonsh/branch/master/graph/badge.svg
-    :target: https://codecov.io/gh/xonsh/xonsh
+    <p align="center">
+    <a href="https://gitter.im/xonsh/xonsh?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge" target="_blank"><img src="https://badges.gitter.im/xonsh/xonsh.svg" alt="Join the chat at https://gitter.im/xonsh/xonsh"></a>
+    <a href="https://matrix.to/#/#xonsh:feneas.org" target="_blank"><img src="https://img.shields.io/badge/%23xonsh%3Afeneas.org-Matrix-green" alt="Matrix room: #xonsh:feneas.org"></a>
+    <a href="https://travis-ci.org/xonsh/xonsh" target="_blank"><img src="https://travis-ci.org/xonsh/xonsh.svg?branch=master" alt="Travis"></a>
+    <a href="https://ci.appveyor.com/project/xonsh/xonsh" target="_blank"><img src="https://ci.appveyor.com/api/projects/status/github/xonsh/xonsh?svg=true" alt="Appveyor"></a>
+    <a href="https://circleci.com/gh/xonsh/xonsh" target="_blank"><img src="https://circleci.com/gh/xonsh/xonsh.svg?style=shield" alt="circleci"></a>
+    <a href="https://codecov.io/gh/xonsh/xonsh" target="_blank"><img src="https://codecov.io/gh/xonsh/xonsh/branch/master/graph/badge.svg" alt="codecov"></a>
+    </p>
 
-xonsh is a Python-powered, cross-platform, Unix-gazing shell language and command prompt.
-The language is a superset of Python 3.5+ with additional shell primitives.
-xonsh (pronounced *conch*) is meant for the daily use of experts and novices alike.
-
-If you like the idea of xonsh click :star: on the repo and stay tuned by watching releases.
+First steps
+***********
 
 Visit https://xon.sh for more information:
 
@@ -39,4 +44,4 @@ Projects that use xonsh
 - `gitsome <https://github.com/donnemartin/gitsome>`_: A supercharged Git/shell autocompleter with GitHub integration.
 - `rever <https://regro.github.io/rever-docs/>`_: Cross-platform software release tool.
 - `Regro autotick bot <https://github.com/regro/cf-scripts>`_: Regro Conda-Forge autoticker.
-- `xxh <https://github.com/xxh/xxh>`_: Using xonsh wherever you go through the ssh.
+- `xxh <https://github.com/xxh/xxh>`_: Using xonsh wherever you go through the ssh.

docs/api/procs/pipelines.rst

@@ -1,4 +1,4 @@
-.. _xonsh_procs_piplines:
+.. _xonsh_procs_pipelines:
 
 ************************************************
 Subprocess Pipelines (``xonsh.procs.pipelines``)

news/back2dir.rst

@@ -0,0 +1,23 @@
+**Added:**
+
+* Add "back2dir" xontrib (https://github.com/anki-code/xontrib-back2dir) - back to the latest used directory when starting xonsh shell.
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>

news/fix_prompt_toolkit_version.rst

@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* prompt-toolkit required version updated to >=3.0
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>

requirements/docs.txt

@@ -1,7 +1,7 @@
 cloud_sptheme
 numpydoc
 Sphinx>=3.1
-prompt_toolkit>=2.0
+prompt_toolkit>=3.0
 pygments>=2.2
 psutil
 pyzmq

requirements/tests.txt

@@ -4,7 +4,7 @@ flake8
 flake8-docstrings
 pytest-cov
 pytest-timeout
-prompt-toolkit>=2.0
+prompt-toolkit>=3.0
 pygments>=2.2
 codecov
 coverage

setup.py

@@ -342,7 +342,7 @@ def main():
     }
     skw["cmdclass"]["develop"] = xdevelop
     skw["extras_require"] = {
-        "ptk": ["prompt-toolkit>=2.0"],
+        "ptk": ["prompt-toolkit>=3.0"],
         "pygments": ["pygments>=2.2"],
         "mac": ["gnureadline"],
         "linux": ["distro"],

xonsh/xontribs.json

@@ -43,6 +43,14 @@
   "url": "https://github.com/AstraLuma/xontrib-avox",
   "description": ["Automatic (de)activation of virtual environments as you cd around"]
  },
+ {"name": "back2dir",
+  "package": "xontrib-back2dir",
+  "url": "https://github.com/anki-code/xontrib-back2dir",
+  "description": [
+    "Return to the most recently used directory when starting the xonsh shell. ",
+    "For example, if you were in the '/work' directory when you last exited xonsh, ",
+    "then your next xonsh session will start in the '/work' directory, instead of your home directory."]
+ },
  {"name": "bashisms",
   "package": "xonsh",
   "url": "http://xon.sh",
@@ -308,6 +316,13 @@
     "pip": "xpip install xontrib-argcomplete"
    }
   },
+  "xontrib-back2dir": {
+   "license": "BSD",
+   "url": "https://github.com/anki-code/xontrib-back2dir",
+   "install": {
+    "pip": "xpip install xontrib-back2dir"
+   }
+  },
   "xonsh-autoxsh": {
    "license": "GPLv3",
    "url": "https://github.com/Granitas/xonsh-autoxsh",