Skip to content

Commit 822150f

Browse files
committed
Merge branch 'release/0.7.1'
* release/0.7.1: (90 commits) DOC: autogenerated usage docs DOC: tools.rst: conda commands RLS: version 0.7.1 ENH: sphincontrib-srclinks #23 https://github.com/westurner/sphinxcontrib-srclinks BUG: .pip/pip.conf: #download_cache is now the pip default (6+) CLN: .gitignore_global: Add .ropeproject DOC: tools.rst: IPython commands DOC: tools.rst DOC: tools.rst: Clang, LLVM, CPython, Cython, PyPy, NumPy, SciPy, IPython DOC: tools.rst: Clang, LLVM, CPython, Cython, PyPy, NumPy, SciPy, IPython DOC: autogenerated usage docs TST: TODO CLN,DOC: ipython_config.py, workon_project -> workon, docstrings DOC: tools.rst BLD: tox.ini: +pip, requirements.txt: +#comments TST: scripts/psutilexample.py: import passthrough BUG: logging syntax wrap=True, splitlines=True ENH: scripts/lessgpy, scripts/lessvpy CLN: remove debug print() calls BUG,TST,BLD,DOC: make tests pass ...
2 parents 9e76305 + f6819be commit 822150f

55 files changed

Lines changed: 4337 additions & 1345 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ help:
6868
@echo "push -- git push"
6969
@echo "pull -- git pull"
7070
@echo ""
71+
@echo "generate_venv -- generate ipython_magics.py, venv.sh, and venv.vim"
72+
@echo ""
7173

7274
help_setuppy:
7375
python setup.py --help
@@ -532,3 +534,12 @@ update_brew_list:
532534

533535
install_brew_formulas:
534536
cat ./etc/brew/brew.list | xargs brew install
537+
538+
_VENV:=./src/dotfiles/venv/ipython_config.py
539+
540+
generate_venv:
541+
# generate ipython_magics.py, venv.sh, and venv.vim
542+
$(_VENV) --print-ipython-magics . > ./src/dotfiles/venv/ipython_magics.py
543+
$(_VENV) --print-bash-aliases --compress --prefix=/ > ./etc/venv/venv.sh
544+
$(_VENV) --print-bash --compress --prefix=/ | grep -v '^export HOME=' > ./etc/venv/venv_root_prefix.sh
545+
$(_VENV) --print-vim-cdalias . > ./etc/venv/venv.vim

README.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Install the dotfiles
5151

5252
The `bootstrap_dotfiles.sh`_ shell script:
5353

54-
* clones the `dotfiles git repository`_ and `dotvim git repository`_
54+
* clones the ``dotfiles`` and ``dotvim`` repositories
5555
* creates symlinks from ``HOME`` to ``__DOTFILES``,
5656
* installs the ``dotfiles`` Python package,
5757
* installs additional requirements with :ref:`pip`
@@ -100,8 +100,7 @@ by the current user, you can also install into ``~/.local`` with
100100
101101
.. _dotfiles git repository: https://github.com/westurner/dotfiles
102102

103-
.. note:: See the `dotfiles venv example`_ which uses
104-
venv-style paths.
103+
.. note:: See `Quickstart`_, which uses venv-style paths.
105104

106105

107106
Source the dotfiles

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.7.0
1+
0.7.1

docs/_ext/edit_on_github.py

Lines changed: 0 additions & 51 deletions
This file was deleted.

docs/_static/css/local.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.navbar {
2+
margin-bottom: 0;
3+
}
4+
5+
#sidebar-wrapper {
6+
background: #f8f8f8;
7+
border-color: #e7e7e7;
8+
border: 1px solid #e7e7e7;
9+
border-top: 0;
10+
margin-top: -1px;
11+
padding-top: 4px;
12+
}

docs/_templates/layout.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<!-- footer -->
44
{%- block footer %}
55
<footer role="contentinfo">
6-
<a href="#">^top^</a>
7-
<br/>
8-
<br/>
96
{%- if show_copyright %}
107
{%- if hasdoc('license') %}
118
{% trans path=pathto('license'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}

docs/_templates/sourcelink.html

Lines changed: 0 additions & 15 deletions
This file was deleted.

docs/_templates/srclinks.html

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{%- if show_source and has_source and sourcename %}
2+
<h3>{{ _('This Page') }}</h3>
3+
<ul class="this-page-menu">
4+
<li><a href="{{ pathto('_sources/' + sourcename, true)|e }}"
5+
rel="nofollow"
6+
target="_blank">{{ _('Source RST') }}</a></li>
7+
{%- if show_srclink_url %}
8+
<li><a href="{{ show_srclink_url }}"
9+
rel="nofollow"
10+
target="_blank">{{ _('Source') }}</a></li>
11+
{%- endif %}
12+
{%- if edit_srclink_url %}
13+
<li><a href="{{ edit_srclink_url }}"
14+
rel="nofollow"
15+
target="_blank">{{ _('Edit') }}</a></li>
16+
{%- endif %}
17+
{%- if history_srclink_url %}
18+
<li><a href="{{ history_srclink_url }}"
19+
rel="nofollow"
20+
target="_blank">{{ _('History') }}</a></li>
21+
{%- endif %}
22+
{%- if annotate_srclink_url %}
23+
<li><a href="{{ annotate_srclink_url }}"
24+
rel="nofollow"
25+
target="_blank">{{ _('Annotate') }}</a></li>
26+
{%- endif %}
27+
</ul>
28+
<h3>Source</h3>
29+
{%- if srclink_src_url %}
30+
<h5><a href="{{ srclink_src_url }}">{{
31+
srclink_src_url.lstrip('https://').lstrip('http://') }}</a>
32+
{%- if srclink_src_rev_url %}
33+
/ <a href="{{ srclink_src_rev_url }}"
34+
rel="nofollow"
35+
target="_blank"
36+
font="monospace">{{ srclink_src_rev }}</a>
37+
{%- endif %}
38+
</h5>
39+
{%- endif %}
40+
41+
<ul>
42+
43+
{%- if srclink_src_https_url %}
44+
<li><pre>{{ srclink_src_clone_cmd }} {{ srclink_src_https_url }}</pre></li>
45+
{%- endif %}
46+
47+
{%- if srclink_src_ssh_url %}
48+
<li><pre>{{ srclink_src_clone_cmd }} {{ srclink_src_ssh_url }}</pre></li>
49+
{%- endif %}
50+
51+
{%- if srclink_src_native_url %}
52+
<li><pre>{{ srclink_src_clone_cmd }} {{ srclink_src_native_url }}</pre></li>
53+
{%- endif %}
54+
</ul>
55+
{%- endif %}

docs/bash_conf.txt

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,15 @@
2929
# $VIRTUAL_ENV (str): path to current $VIRTUAL_ENV
3030
#
3131
## 07-bashrc.python.sh -- python
32-
# _setup_anaconda() -- setup anaconda paths (manual)
3332
# _setup_pyenv() -- setup pyenv paths (manual)
33+
# _setup_conda() -- setup conda paths (manual)
3434
#
3535
## 07-bashrc.virtualenvwrapper.sh -- virtualenvwrapper
36+
# backup_virtualenv($VENVSTR) -- backup $WORKON_HOME/$VENVSTR -> ./-bkp/$VENVSTR
37+
# backup_virtualenvs() -- backup $WORKON_HOME/* -> ./-bkp/*
38+
# rebuild_virtualenv($VENVSTR) -- rebuild $WORKON_HOME/$VENVSTR
39+
# rebuild_virtualenvs() -- rebuild $WORKON_HOME/*
40+
# TODO: restore
3641
#
3742
## 08-bashrc.gcloud.sh -- gcloud: Google Cloud SDK
3843
# _setup_google_cloud() -- setup google cloud paths
@@ -51,10 +56,16 @@
5156
## 11-bashrc.venv.pyramid.sh -- venv-pyramid: pyramid-specific config
5257
#
5358
## 20-bashrc.editor.sh -- $EDITOR configuration
54-
# $_EDIT_ (str): cmdstring to open $@ (file list) in current editor
55-
# $EDITOR (str): cmdstring to open $@ (file list) in current editor
59+
# $_EDIT_ (str): cmdstring to open $@ (file list) in current editor
60+
# $EDITOR_ (str): cmdstring to open $@ (file list) in current editor
61+
#
5662
## 20-bashrc.vimpagers.sh -- $PAGER configuration
57-
# $PAGER (str): cmdstring to run pager (less/vim)
63+
# $PAGER (str): cmdstring to run pager (less/vim)
64+
# lessv() -- open in vim with less.vim
65+
# VIMPAGER_SYNTAX="python" lessv
66+
# lessg() -- open in a gvim with less.vim
67+
# VIMPAGER_SYNTAX="python" lessv
68+
# lesse() -- open with $EDITOR_
5869
#
5970
## 30-bashrc.usrlog.sh -- $_USRLOG configuration
6071
# $_USRLOG (str): path to .usrlog command log
@@ -147,6 +158,8 @@
147158
# debug-on() -- set -x -v
148159
# debug-off() -- set +x +v
149160
# log_dotfiles_state() -- save current environment to logfiles
161+
# XXX:
162+
# XXX:
150163
# dotfiles_initialize() -- virtualenvwrapper initialize
151164
# dotfiles_postmkvirtualenv -- virtualenvwrapper postmkvirtualenv
152165
# dotfiles_preactivate() -- virtualenvwrapper preactivate
@@ -169,13 +182,12 @@
169182
## Pyenv
170183
# _setup_pyvenv() -- set $PYENV_ROOT, add_to_path, and pyenv venvw
171184
## Conda / Anaconda
172-
# _setup_anaconda() -- set $ANACONDA_ROOT, add_to_path
185+
# _setup_anaconda() -- set $CONDA_ROOT, add_to_path
173186
# workon_conda() -- workon a conda + venv project
174187
# wec() -- workon a conda + venv project
175188
# note: tab-completion only shows regular virtualenvs
176189
# mkvirtualenv_conda() -- mkvirtualenv and conda create
177190
# rmvirtualenv_conda() -- rmvirtualenv conda
178-
# TODO
179191
# mkvirtualenv_conda_if_available() -- mkvirtualenv_conda OR mkvirtualenv
180192
# workon_conda_if_available() -- workon_conda OR we OR workon
181193

@@ -190,7 +202,12 @@
190202
# backup_virtualenv() -- backup VIRTUAL_ENV_NAME $1 to [$2]
191203
# backup_virtualenvs() -- backup all virtualenvs in $WORKON_HOME to [$1]
192204
# rebuild_virtualenv() -- rebuild a virtualenv, leaving pkgs in place
205+
# $1="$VENVSTR"
206+
# $2="$VIRTUAL_ENV"
193207
# TODO: adjust paths beyond the shebang
208+
# rebuild_virtualenv() -- rebuild a virtualenv
209+
# $1="$VENVSTR"
210+
# $2="$VIRTUAL_ENV"
194211
# rebuild_virtualenvs() -- rebuild all virtualenvs in $WORKON_HOME
195212

196213

@@ -210,8 +227,8 @@
210227
## Functions
211228
# venv $@ -- call $_VENV $@
212229
# venv -h -- print venv --help
213-
# venv -b -- print bash configuration
214-
# venv -p -- print IPython configuration as JSON
230+
# venv --print-bash -- print bash configuration
231+
# venv --print-json -- print IPython configuration as JSON
215232
# _venv <args> -- call $_VENV -E $@ (for the current environment)
216233
# workon_venv() -- workon a virtualenv and load venv (TAB-completion)
217234
# param $1: $VIRTUAL_ENV_NAME ("dotfiles")
@@ -222,7 +239,6 @@
222239
# examples:
223240
# we dotfiles
224241
# we dotfiles dotfiles
225-
# TODO
226242
# we() -- workon_venv
227243
# CdAlias functions and completions
228244
## Grin search
@@ -286,6 +302,7 @@
286302
# EDITOR_ (str): $EDITOR || $GUIVIMBIN $VIMCONF --remote-tab-silent
287303
# VIMCONF (str): --servername ${VIRTUAL_ENV_NAME:-'EDITOR'}
288304
# SUDO_EDITOR (str): $EDITOR
305+
# _setup_pager() -- set PAGER='less'
289306
# ggvim() -- ${EDITOR} $@ 2>&1 >/dev/null
290307
# edits() -- open $@ in ${GUIVIMBIN} --servername $1
291308
# e() -- ${EDITOR_} $@ [ --servername $VIRTUAL_ENV_NAME ]
@@ -362,13 +379,15 @@
362379
# gac() -- 'git diff ${files}; git commit -m $1 ${files}'
363380
# $1 (str): quoted commit message
364381
# $2- (list): file paths
365-
# gl -- 'git log --pretty=format:"%h : %an : %s" --topo-order --graph'
366-
# gs -- 'git status'
382+
# gb -- 'git branch -v'
367383
# gd -- 'git diff'
368384
# gds -- 'git diff -p --stat'
369385
# gc -- 'git commit'
370386
# gco -- 'git checkout'
371387
# gdc -- 'git diff --cached'
388+
# gl -- 'git log --pretty=format:"%h : %an : %s" --topo-order --graph'
389+
# gr -- 'git remote -v'
390+
# gs -- 'git status'
372391
# gsi -- 'git is; git diff; git diff --cached'
373392
# gsiw -- 'git -C $_WRD gsi'
374393
# gsl -- 'git stash list'
@@ -619,6 +638,8 @@
619638
# with pyline
620639
# TODO: handle HISTTIMEFORMAT="" (" histn <cmd>")
621640
# TODO: handle newlines (commands that start on the next line)
641+
# TODO: HISTTIMEFORMAT histn (OSX ) [ 8 ]
642+
# TODO: HISTTIMEFORMAT histn (Linux) [ 7 ]
622643
## usrlog.sh API
623644
# ut() -- show recent commands
624645
# termid() -- echo $_TERM_ID

docs/changelog.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ and docstring extraction:
1717

1818
* `src/dotfiles/venv/ipython_config.py <https://github.com/westurner/dotfiles/blame/master/src/dotfiles/venv/ipython_config.py>`__
1919
* `etc/bash <https://github.com/westurner/dotfiles/commits/master/etc/bash>`__
20-
* `scripts/bashrc.load.sh <https://github.com/westurner/dotfiles/commits/develop/master/scripts/bashrc.load.sh>`__
20+
* `scripts/_dotfiles_bash.log.sh <https://github.com/westurner/dotfiles/commits/develop/scripts/_dotfiles_bash.log.sh>`__
2121
* `etc/zsh <https://github.com/westurner/dotfiles/commits/master/etc/zsh>`__
22-
* `scripts/zsh.load.sh <https://github.com/westurner/dotfiles/commits/develop/master/scripts/zsh.load.sh>`__
22+
* `scripts/_dotfiles_zsh.log.sh <https://github.com/westurner/dotfiles/commits/develop/scripts/_dotfiles_zsh.log.sh>`__
2323

2424
.. code:: bash
2525

0 commit comments

Comments
 (0)