diff --git a/README.rst b/README.rst index 72ef9ffd1..884c91972 100644 --- a/README.rst +++ b/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 +

+ xonsh is a Python-powered, cross-platform, Unix-gazing shell language and command prompt. +

-.. image:: https://travis-ci.org/xonsh/xonsh.svg?branch=master - :target: https://travis-ci.org/xonsh/xonsh +

+ 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. +

-.. image:: https://ci.appveyor.com/api/projects/status/github/xonsh/xonsh?svg=true - :target: https://ci.appveyor.com/project/xonsh/xonsh +

+ What is xonsh? +

-.. image:: https://circleci.com/gh/xonsh/xonsh.svg?style=shield - :target: https://circleci.com/gh/xonsh/xonsh +

+ If you like xonsh, :star: the repo and stay tuned by watching releases. +

-.. image:: https://codecov.io/gh/xonsh/xonsh/branch/master/graph/badge.svg - :target: https://codecov.io/gh/xonsh/xonsh +

+ Join the chat at https://gitter.im/xonsh/xonsh + Matrix room: #xonsh:feneas.org + Travis + Appveyor + circleci + codecov +

-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 `_: A supercharged Git/shell autocompleter with GitHub integration. - `rever `_: Cross-platform software release tool. - `Regro autotick bot `_: Regro Conda-Forge autoticker. -- `xxh `_: Using xonsh wherever you go through the ssh. +- `xxh `_: Using xonsh wherever you go through the ssh. \ No newline at end of file diff --git a/docs/_static/xonsh4.png b/docs/_static/xonsh4.png new file mode 100644 index 000000000..7467cd770 Binary files /dev/null and b/docs/_static/xonsh4.png differ diff --git a/docs/api/procs/pipelines.rst b/docs/api/procs/pipelines.rst index 5095e5765..89ff32e0c 100644 --- a/docs/api/procs/pipelines.rst +++ b/docs/api/procs/pipelines.rst @@ -1,4 +1,4 @@ -.. _xonsh_procs_piplines: +.. _xonsh_procs_pipelines: ************************************************ Subprocess Pipelines (``xonsh.procs.pipelines``) diff --git a/news/back2dir.rst b/news/back2dir.rst new file mode 100644 index 000000000..432be7844 --- /dev/null +++ b/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:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* diff --git a/news/fix_prompt_toolkit_version.rst b/news/fix_prompt_toolkit_version.rst new file mode 100644 index 000000000..f569cc7bd --- /dev/null +++ b/news/fix_prompt_toolkit_version.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* prompt-toolkit required version updated to >=3.0 + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* + +**Security:** + +* diff --git a/requirements/docs.txt b/requirements/docs.txt index bf538e4f0..218cfb503 100644 --- a/requirements/docs.txt +++ b/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 diff --git a/requirements/tests.txt b/requirements/tests.txt index 81c9092ae..2d2106658 100644 --- a/requirements/tests.txt +++ b/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 diff --git a/setup.py b/setup.py index f74a42926..77570ff36 100755 --- a/setup.py +++ b/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"], diff --git a/xonsh/xontribs.json b/xonsh/xontribs.json index c72f047ac..27c584407 100644 --- a/xonsh/xontribs.json +++ b/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",