From 9c0528775412e98f168383b8967b6c048a5aaabc Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Fri, 29 May 2015 23:48:23 +0300 Subject: [PATCH 1/9] version bump --- recipe/meta.yaml | 2 +- xonsh/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1ea4ac6f4..28d197459 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: xonsh - version: "0.1.5" + version: "0.1.6" source: fn: xonsh.tar.gz diff --git a/xonsh/__init__.py b/xonsh/__init__.py index 66a87bb6e..2fb25139f 100644 --- a/xonsh/__init__.py +++ b/xonsh/__init__.py @@ -1 +1 @@ -__version__ = '0.1.5' +__version__ = '0.1.6' From d6bf634cf9675cbfbc6c2b31cd08bb1eeba78775 Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Sat, 30 May 2015 00:01:49 +0300 Subject: [PATCH 2/9] minor doc fix --- docs/api/proc.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api/proc.rst b/docs/api/proc.rst index 16917526a..789871c1e 100644 --- a/docs/api/proc.rst +++ b/docs/api/proc.rst @@ -1,8 +1,8 @@ .. _xonsh_proc: -****************************************************** +********************************************************** Python Procedures as Subprocess Commands (``xonsh.proc``) -****************************************************** +********************************************************** .. automodule:: xonsh.proc :members: From d7a45ec3bc96f241095afe406f5e311f458a6456 Mon Sep 17 00:00:00 2001 From: adam j hartz Date: Wed, 3 Jun 2015 10:32:34 -0500 Subject: [PATCH 3/9] ignore vim and emacs temp files --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index f63f7c23e..b453bd492 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,13 @@ dist/ xonsh.egg-info/ docs/_build/ +# temporary files from vim and emacs +*~ +*# +.#* +*.swp +*.swo + # Virtualenv pip-selfcheck.json bin/ From ff6194f60de8da16692e1ab772aba86053b1db3b Mon Sep 17 00:00:00 2001 From: adam j hartz Date: Wed, 3 Jun 2015 10:47:11 -0500 Subject: [PATCH 4/9] change when twiddle gets expanded --- xonsh/parser.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xonsh/parser.py b/xonsh/parser.py index a8989e731..bb3018369 100644 --- a/xonsh/parser.py +++ b/xonsh/parser.py @@ -2260,6 +2260,7 @@ class Parser(object): col=self.col) p0._cliarg_action = 'extend' else: + p0.s = os.path.expanduser(p0.s) p0._cliarg_action = 'append' elif isinstance(p1, ast.AST): p0 = p1 @@ -2305,7 +2306,7 @@ class Parser(object): if len(p) == 2: p0 = p1 else: - p0 = os.path.expanduser(p1 + p[2]) + p0 = p1 + p[2] p[0] = p0 def p_subproc_arg_part(self, p): From 4ad68697a2f4999f25f5027e033c90c600717d58 Mon Sep 17 00:00:00 2001 From: adam j hartz Date: Fri, 5 Jun 2015 16:42:40 -0400 Subject: [PATCH 5/9] implement source alias --- xonsh/aliases.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xonsh/aliases.py b/xonsh/aliases.py index 1ceddf16f..17078f402 100644 --- a/xonsh/aliases.py +++ b/xonsh/aliases.py @@ -47,6 +47,12 @@ def source_bash(args, stdin=None): return +def source_alias(args, stdin=None): + """Executes the contents of the provided files in the current context.""" + for fname in args: + execx(open(fname).read(), 'exec', builtins.__xonsh_ctx__) + + def xexec(args, stdin=None): """ Replaces current process with command specified and passes in the @@ -99,6 +105,7 @@ DEFAULT_ALIASES = { 'exit': exit, 'quit': exit, 'xexec': xexec, + 'source': source_alias, 'timeit': timeit_alias, 'source-bash': source_bash, 'scp-resume': ['rsync', '--partial', '-h', '--progress', '--rsh=ssh'], From 4cfcd2178c831b9076ec54946ab589f54ea17636 Mon Sep 17 00:00:00 2001 From: "Robert W. Brewer" Date: Fri, 5 Jun 2015 16:59:06 -0700 Subject: [PATCH 6/9] add appveyor.yml --- appveyor.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..8c6d29df1 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,10 @@ +version: 0.1.6.{build} +os: Windows Server 2012 R2 +install: +- C:\Python34\Scripts\pip install ply pyreadline nose +build_script: +- C:\Python34\python setup.py install +test_script: +- cd tests +- C:\Python34\Scripts\nosetests + From b9f451a13121cf03d035b823dda014cc919c7f67 Mon Sep 17 00:00:00 2001 From: "Robert W. Brewer" Date: Fri, 5 Jun 2015 17:07:31 -0700 Subject: [PATCH 7/9] appveyor: add badge --- README.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.rst b/README.rst index 8d1fbf733..08202ffa7 100644 --- a/README.rst +++ b/README.rst @@ -4,6 +4,9 @@ xonsh .. image:: https://travis-ci.org/scopatz/xonsh.svg?branch=master :target: https://travis-ci.org/scopatz/xonsh +.. image:: https://ci.appveyor.com/api/projects/status/9xooq2hmfcif8f6d/branch/master?svg=true + :target: https://ci.appveyor.com/project/rbrewer123/xonsh + .. image:: https://landscape.io/github/scopatz/xonsh/master/landscape.svg?style=flat :target: https://landscape.io/github/scopatz/xonsh/master :alt: Code Health From 81ebbe786e7d30564a6728d5c5ace829154d07e4 Mon Sep 17 00:00:00 2001 From: "Robert W. Brewer" Date: Fri, 5 Jun 2015 17:12:38 -0700 Subject: [PATCH 8/9] appveyor: add prompt_toolkit, hide .yml file --- appveyor.yml => .appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename appveyor.yml => .appveyor.yml (66%) diff --git a/appveyor.yml b/.appveyor.yml similarity index 66% rename from appveyor.yml rename to .appveyor.yml index 8c6d29df1..43c7f2fe0 100644 --- a/appveyor.yml +++ b/.appveyor.yml @@ -1,10 +1,9 @@ version: 0.1.6.{build} os: Windows Server 2012 R2 install: -- C:\Python34\Scripts\pip install ply pyreadline nose +- C:\Python34\Scripts\pip install ply pyreadline nose prompt_toolkit build_script: - C:\Python34\python setup.py install test_script: -- cd tests - C:\Python34\Scripts\nosetests From 138b404dd85d4e2f1355d6234ece19d00acbc971 Mon Sep 17 00:00:00 2001 From: "Robert W. Brewer" Date: Fri, 5 Jun 2015 20:26:12 -0400 Subject: [PATCH 9/9] appveyor: watch scopatz/xonsh --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 08202ffa7..54e3e39bb 100644 --- a/README.rst +++ b/README.rst @@ -4,8 +4,8 @@ xonsh .. image:: https://travis-ci.org/scopatz/xonsh.svg?branch=master :target: https://travis-ci.org/scopatz/xonsh -.. image:: https://ci.appveyor.com/api/projects/status/9xooq2hmfcif8f6d/branch/master?svg=true - :target: https://ci.appveyor.com/project/rbrewer123/xonsh +.. image:: https://ci.appveyor.com/api/projects/status/ufqtigii8ma3rctt/branch/master?svg=true + :target: https://ci.appveyor.com/project/rbrewer123/xonsh-unq93 .. image:: https://landscape.io/github/scopatz/xonsh/master/landscape.svg?style=flat :target: https://landscape.io/github/scopatz/xonsh/master