Skip to content

Commit 38dda07

Browse files
committed
Merge branch 'autoenv' for autoenv compatibility
Formerly .env was being used for virtualenv's inside the bootstrap and gitignore. Changed it to .venv to not conflict with autoenv, a separate application for running arbitrary commands upon cd(1).
2 parents d941403 + 2c4150a commit 38dda07

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
*.pyc
22
*.pyo
3-
.env
4-
.env3
3+
.venv
4+
.venv3
55
dist
66
*.egg
77
*.egg-info

.tmuxp.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"layout": "main-horizontal",
1616
"shell_command_before": [
17-
"[ -d .env -a -f .env/bin/activate ] && source .env/bin/activate"
17+
"[ -d .venv -a -f .venv/bin/activate ] && source .venv/bin/activate"
1818
],
1919
"focus": true,
2020
"window_name": "tmuxp"
@@ -31,7 +31,7 @@
3131
"start_directory": "doc/",
3232
"layout": "main-horizontal",
3333
"shell_command_before": [
34-
"[ -d ../.env -a -f ../.env/bin/activate ] && source ../.env/bin/activate"
34+
"[ -d ../.venv -a -f ../.venv/bin/activate ] && source ../.venv/bin/activate"
3535
],
3636
"options": {
3737
"main-pane-height": 35

.tmuxp.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ windows:
88
options:
99
main-pane-height: 35
1010
shell_command_before:
11-
- '[ -d .env -a -f .env/bin/activate ] && source .env/bin/activate'
11+
- '[ -d .venv -a -f .venv/bin/activate ] && source .venv/bin/activate'
1212
panes:
1313
- focus: true
1414
- pane
@@ -19,7 +19,7 @@ windows:
1919
main-pane-height: 35
2020
start_directory: doc/
2121
shell_command_before:
22-
- '[ -d ../.env -a -f ../.env/bin/activate ] && source ../.env/bin/activate'
22+
- '[ -d ../.venv -a -f ../.venv/bin/activate ] && source ../.venv/bin/activate'
2323
panes:
2424
- focus: true
2525
- pane

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ install dev .. code-block:: bash
6868

6969
$ git clone https://github.com/tony/tmuxp.git tmuxp
7070
$ cd ./tmuxp
71-
$ virtualenv .env
72-
$ source .env/bin/activate
71+
$ virtualenv .venv
72+
$ source .venv/bin/activate
7373
$ pip install -e .
7474

7575
See the `developing and testing`_ page in the docs for

bootstrap_env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def which(exe=None, throw=True):
7575

7676

7777
project_dir = os.path.dirname(os.path.realpath(__file__))
78-
env_dir = os.path.join(project_dir, '.env')
78+
env_dir = os.path.join(project_dir, '.venv')
7979
pip_bin = os.path.join(env_dir, 'bin', 'pip')
8080
python_bin = os.path.join(env_dir, 'bin', 'python')
8181
virtualenv_bin = which('virtualenv', throw=False)

doc/developing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ virtualenv with:
3232

3333
.. code-block:: bash
3434
35-
$ virtualenv .env
35+
$ virtualenv .venv
3636
3737
Then activate it to your current tty / terminal session with:
3838

3939
.. code-block:: bash
4040
41-
$ source .env/bin/activate
41+
$ source .venv/bin/activate
4242
4343
Good! Now let's run this:
4444

@@ -59,7 +59,7 @@ Test Runner
5959

6060
As you seen above, the ``tmuxp`` command will now be available to you,
6161
since you are in the virtual environment, your `PATH` environment was
62-
updated to include a special version of ``python`` inside your ``.env``
62+
updated to include a special version of ``python`` inside your ``.venv``
6363
folder with its own packages.
6464

6565
.. code-block:: bash

tmuxp/testsuite/config.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ class ShellCommandBeforeTest(TestCase):
575575
{
576576
'window_name': 'editor',
577577
'start_directory': '~',
578-
'shell_command_before': 'source .env/bin/activate',
578+
'shell_command_before': 'source .venv/bin/activate',
579579
'panes': [
580580
{
581581
'shell_command': ['vim'],
@@ -626,7 +626,7 @@ class ShellCommandBeforeTest(TestCase):
626626
{
627627
'window_name': 'editor',
628628
'start_directory': os.path.expanduser('~'),
629-
'shell_command_before': ['source .env/bin/activate'],
629+
'shell_command_before': ['source .venv/bin/activate'],
630630
'panes': [
631631
{
632632
'shell_command': ['vim'],
@@ -680,15 +680,15 @@ class ShellCommandBeforeTest(TestCase):
680680
{
681681
'window_name': 'editor',
682682
'start_directory': os.path.expanduser('~'),
683-
'shell_command_before': ['source .env/bin/activate'],
683+
'shell_command_before': ['source .venv/bin/activate'],
684684
'panes': [
685685
{
686-
'shell_command': ['source .env/bin/activate', 'vim'],
686+
'shell_command': ['source .venv/bin/activate', 'vim'],
687687
},
688688
{
689689
'shell_command_before': ['rbenv local 2.0.0-p0'],
690690
'shell_command': [
691-
'source .env/bin/activate',
691+
'source .venv/bin/activate',
692692
'rbenv local 2.0.0-p0', 'cowsay "hey"'
693693
]
694694
},

tmuxp/testsuite/window.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def test_zfresh_window_data(self):
7979
self.session.attached_window().select_pane(pane_base_index)
8080
self.session.attached_pane().send_keys('cd /srv/www/flaskr')
8181
self.session.attached_window().select_pane(pane_base_index + 1)
82-
self.session.attached_pane().send_keys('source .env/bin/activate')
82+
self.session.attached_pane().send_keys('source .venv/bin/activate')
8383
self.session.new_window(window_name='second')
8484
current_windows += 1
8585
self.assertEqual(current_windows, len(self.session._windows))

0 commit comments

Comments
 (0)