Skip to content

Commit 4314d2a

Browse files
authored
Merge pull request #438 from rfoliva/pipenv-update-doc
Pipenv update doc
2 parents 8aeeed6 + 78c43ea commit 4314d2a

File tree

8 files changed

+99
-24
lines changed

8 files changed

+99
-24
lines changed

Pipfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ alagitpull = "*"
99
releases = "*"
1010
aafigure = "*"
1111
sphinxcontrib-napoleon = "*"
12-
Sphinx = "*"
12+
sphinx = "*"
1313
isort = "*"
1414
"flake8" = "*"
1515
vulture = "*"
1616
pytest = "*"
1717
pytest-rerunfailures = "*"
1818
tmuxp = {path = ".", editable = true}
1919
"e1839a8" = {path = ".", editable = true}
20+
"doc8" = "*"
2021

2122
[packages]
2223
kaptan = "*"
2324
libtmux = "==0.8.0"
2425
click = ">=7<8"
2526
colorama = "*"
2627
"e1839a8" = {path = ".", editable = true}
27-
sphinx = "*"
2828

2929
[requires]
3030
python_version = "2.7"

Pipfile.lock

+29-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/about.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ Built on a object relational mapper for tmux. tmux users can reload common
1212
workspaces from YAML, JSON and :py:obj:`dict` configurations like
1313
`tmuxinator`_ and `teamocil`_.
1414

15-
tmuxp is used by developers for tmux automation at great companies like
15+
tmuxp is used by developers for tmux automation at great companies like
1616
`Bugsnag`_, `Pragmatic Coders`_ and many others.
1717

1818
To jump right in, see :ref:`quickstart` and :ref:`examples`.
1919

2020
Interested in some kung-fu or joining the effort? :ref:`api` and
2121
:ref:`developing`.
2222

23-
`MIT-licensed`_. Code on `github
23+
`MIT-licensed`_. Code on `github
2424
<http://github.com/tmux-python/tmuxp>`_.
2525

2626
.. _Bugsnag: https://blog.bugsnag.com/benefits-of-using-tmux/
@@ -84,7 +84,7 @@ See :ref:`libtmux's internals <libtmux:Internals>`.
8484
**Conversion** ``$ tmuxp convert <filename>`` can convert files to and
8585
from JSON and YAML.
8686

87-
.. [1] While freezing and importing sessions is a great way to save time,
87+
.. [1] While freezing and importing sessions is a great way to save time,
8888
tweaking will probably be required - There is no substitute to a
8989
config made with love.
9090

doc/about_tmux.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ sandwich, and re-(attach), all applications are still running!
154154
+--------+--------+
155155
| $ bash | $ bash |
156156
| | |
157-
| | | /------------\
158-
+--------+--------+ --> | detach |
159-
| $ vim | $ bash | | 'Ctrl-b b' |
160-
| | | \------------/
157+
| | | /------------\
158+
+--------+--------+ --> | detach |
159+
| $ vim | $ bash | | 'Ctrl-b b' |
160+
| | | \------------/
161161
| | | |
162162
+--------+--------+ |
163163
/------------------/
@@ -208,7 +208,7 @@ Applications running on a remote server can be launched inside of a tmux
208208
session, detached, and reattached next timeyour `"train of thought"`_ and
209209
work.
210210

211-
Multitasking. Preserving the thinking you have.
211+
Multitasking. Preserving the thinking you have.
212212

213213
.. _"train of thought": http://en.wikipedia.org/wiki/Train_of_thought
214214

@@ -258,7 +258,7 @@ That's all it takes to launch yourself into a tmux session.
258258
Running ``$ tmux list-sessions`` or any other command for listing tmux
259259
entities (such as ``$ tmux list-windows`` or ``$ tmux list-panes``).
260260
This can generate the error "failed to connect to server".
261-
261+
262262
This could be because:
263263

264264
- tmux server has killed its' last session, killing the server.
@@ -633,7 +633,7 @@ Short cut Action
633633
``M-o`` Rotate the panes in the current window backwards.
634634
``M-p`` Move to the previous window with a bell or activity
635635
marker.
636-
``C-Up, C-Down`` Resize the current pane in steps of one cell.
636+
``C-Up, C-Down`` Resize the current pane in steps of one cell.
637637
``C-Left, C-Right``
638638
``M-Up, M-Down`` Resize the current pane in steps of five cells.
639639
``M-Left, M-Right``

doc/developing.rst

+50-5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ using ``$ tmux -L test_case``.
2222
Install the latest code from git
2323
--------------------------------
2424

25+
Using pip
26+
^^^^^^^^^
27+
2528
To begin developing, check out the code from github:
2629

2730
.. code-block:: bash
@@ -56,6 +59,48 @@ adjust the code and the installed software will reflect the changes.
5659
5760
$ tmuxp
5861
62+
Using pipenv
63+
^^^^^^^^^^^^
64+
65+
To begin developing, check out the code from github:
66+
67+
.. code-block:: bash
68+
69+
$ git clone [email protected]:tmux-python/tmuxp.git
70+
$ cd tmuxp
71+
72+
You can create a virtualenv, and install all of the locked
73+
packages as listed in Pipfile.lock:
74+
75+
.. code-block:: bash
76+
77+
$ pipenv install --ignore-pipfile --dev
78+
79+
If you prefer to install updated packages based on Pipfile only, not being
80+
bound by Pipfile.lock:
81+
82+
.. code-block:: bash
83+
84+
$ pipenv install --skip-lock --dev
85+
86+
If you ever need to update packages during your development session, the
87+
following command can be used to update all packages as per Pipfile settings or
88+
individual package (second command):
89+
90+
.. code-block:: bash
91+
92+
$ pipenv update --dev
93+
$ pipenv update requests
94+
95+
Then activate it to your current tty / terminal session with:
96+
97+
.. code-block:: bash
98+
99+
$ pipenv shell
100+
101+
That is it! You are now ready to code!
102+
103+
59104
Test Runner
60105
-----------
61106

@@ -76,7 +121,7 @@ If you found a problem or are trying to write a test, you can file an
76121
.. _test_specific_tests:
77122

78123
Test runner options
79-
~~~~~~~~~~~~~~~~~~~
124+
^^^^^^^^^^^^^^^^^^^
80125

81126
Test only a file:
82127

@@ -101,7 +146,7 @@ Multiple can be separated by spaces:
101146
.. _test_builder_visually:
102147

103148
Visual testing
104-
~~~~~~~~~~~~~~
149+
--------------
105150

106151
You can watch tmux testsuite build sessions visually by keeping a client
107152
open in a separate terminal.
@@ -114,7 +159,7 @@ Create two terminals:
114159
version of tmuxp above. Then:
115160

116161
.. code-block:: bash
117-
162+
118163
$ py.test tests/test_workspacebuilder.py
119164
120165
Terminal 1 should have flickered and built the session before your eyes.
@@ -147,7 +192,7 @@ argument`_:
147192
$ make watch_test test='-x tests/test_config.py tests/test_util.py'
148193
149194
Rebuild sphinx docs on save
150-
~~~~~~~~~~~~~~~~~~~~~~~~~~~
195+
---------------------------
151196

152197
Rebuild the documentation when an ``.rst`` file is edited:
153198

@@ -178,7 +223,7 @@ this will load the ``.tmuxp.yaml`` in the root of the project.
178223
.. _travis:
179224

180225
Travis CI
181-
~~~~~~~~~
226+
---------
182227

183228
tmuxp uses `travis-ci`_ for continuous integration / automatic unit
184229
testing.

doc/examples.rst

+6-5
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,12 @@ In this case of this example, assuming the username "user"::
183183

184184
$ MY_ENV_VAR=foo tmuxp load examples/env-variables.yaml
185185

186-
and your session name will be ``session - user (foo)``.
186+
and your session name will be ``session - user (foo)``.
187187

188-
Shell variables in ``shell_command`` do not support this type of
188+
Shell variables in ``shell_command`` do not support this type of
189189
concatenation. ``shell_command`` and ``shell_command_before`` both
190190
support normal shell variables, since they are sent into panes
191-
automatically via ``send-key`` in ``tmux(1)``. See ``ls $PWD`` in
191+
automatically via ``send-key`` in ``tmux(1)``. See ``ls $PWD`` in
192192
example.
193193

194194
If you have a special case and would like to see behavior changed,
@@ -369,7 +369,7 @@ A successful script will exit with a status of ``0``.
369369
Important: the script file must be chmod executable ``+x`` or ``755``.
370370

371371
Run a python script (and check for it's return code), the script is
372-
*relative to the ``.tmuxp.yaml``'s root* (Windows and panes omitted in
372+
*relative to the ``.tmuxp.yaml``'s root* (Windows and panes omitted in
373373
this example):
374374

375375
.. code-block:: yaml
@@ -450,7 +450,8 @@ packages are installed:
450450
- blank
451451
- pipenv run ./manage.py runserver
452452
453-
You can also source yourself into the virtual environment using ``shell_command_before``:
453+
You can also source yourself into the virtual environment using
454+
``shell_command_before``:
454455

455456
.. code-block:: yaml
456457

doc/glossary.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Glossary
3737

3838
Session
3939
Inside a tmux :term:`server`.
40-
40+
4141
The session has 1 or more :term:`Window`. The bottom bar in tmux
4242
show a list of windows. Normally they can be navigated with
4343
``Ctrl-a [0-9]``, ``Ctrl-a n`` and ``Ctrl-a p``.

requirements/doc.txt

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ alagitpull==0.0.21
55
releases==1.6.1
66
aafigure==0.6
77
sphinxcontrib-napoleon==0.7
8+
doc8==0.8.0

0 commit comments

Comments
 (0)