Skip to content

Commit 0583721

Browse files
miracle2kmiracle2k
committed
Merged upstream.
--HG-- rename : virtualenvwrapper_bashrc => virtualenvwrapper.sh
2 parents cee9034 + 415ea28 commit 0583721

Some content is hidden

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

83 files changed

+10290
-1753
lines changed

‎.hgignore

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
syntax: glob
2-
README.html
3-
virtualenvwrapper.egg-info
4-
paver-minilib.zip
5-
setup.py
6-
trace.txt
7-
docs
82
*.pyc
9-
sphinx/web/templates/base.html
3+
README.html
4+
build
5+
dist
6+
distribute*.egg
7+
distribute*.tar.gz
8+
docs/build
9+
docs/html
10+
docs/website
1011
tests/catch_output
12+
tests/testpackage/build
13+
tests/testpackage/dist
14+
tests/testpackage/testpackage.egg-info
15+
trace.txt
16+
virtualenvwrapper.egg-info
17+
virtualenvwrapper/docs
18+
.tox
19+
*.orig
1120

1221
syntax: re
1322
.DS_Store

‎.hgtags

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,40 @@ c50385e9c99b207f56a968926b0f7e21a2b09366 1.22
3838
e55e8a54de7be78b8400632ab004abb29aaa8899 1.23
3939
b243d023094b6b0ef1b834dcc100f8c342c67537 1.24
4040
4a8870326d84f97d5539b586b21419ba330fea48 1.24.1
41+
f318697791416cf0897091718d542e8045854233 1.24.2
42+
06229877a640ecb490faf46f923d8be916a0ebed 1.25
43+
51eef82a39d431cee156fea7005fa1631e21655e 1.26
44+
3edf5f22481587608f8c172f8758014446a2d888 1.27
45+
3edf5f22481587608f8c172f8758014446a2d888 1.27
46+
d64869519c2e0553303cfeeb0918271564c72beb 1.27
47+
485e1999adf0d388340aec42bae4d87f93b8da92 2.0
48+
485e1999adf0d388340aec42bae4d87f93b8da92 2.0
49+
54713c4552c2bcf0155071c87cfca84ed1ea5f6e 2.0
50+
91e1124c68315f8cdc6578c4f72e3ed9c44e1fca 2.0.1
51+
6a51a81454ae9dde5d923668ad5f034b3467fe11 2.0.2
52+
241df6c36860c13fae5468881457a27840ee9d72 2.1
53+
7540fc7d8e63cafe6c3126e0855ed8c277b450cf 2.1.1
54+
d5c5faecc92daef3d15510f0314d4d5e6c95e234 2.2
55+
66a89d019905aa7b697b7ce69303201f50e1d4e7 2.2.1
56+
66a89d019905aa7b697b7ce69303201f50e1d4e7 2.2.1
57+
87d60f20a715e5641e819d127cfdc31f8003c4f2 2.2.1
58+
266a166f80da390a22e684497f971b6b22776cb9 2.2.2
59+
b9d4591458bbaf41d4e40104e8f19c19d76b4664 2.3
60+
64f858d461d449601d6bc3e2521b34dbd1c916a5 2.4
61+
64f858d461d449601d6bc3e2521b34dbd1c916a5 2.4
62+
a85d80e88996c15e2e2b832e2956811eea73ee34 2.4
63+
80e2fcda77acd85500159e3e688e5acfa3d99bd3 2.5
64+
2ab678413a290410ed4c8a1b72a567d79caa5ae5 2.5.1
65+
f71ffbb996c41606aea15b2114120d9fca3adfc6 2.5.2
66+
dc74f106d8d2dd58031b2dbac31b1e068f780de4 2.5.3
67+
b0f27c65fa64627599c2a022a076ae5ee7157ae4 2.6
68+
445a58d5a05a1426cefb47e54b692b6a58fdcc4f 2.6.1
69+
625d85d3136ff746accc490c5f9210b1b0074533 2.6.2
70+
e7582879df06689ec54cd820c377e89114b75ee2 2.6.3
71+
e7582879df06689ec54cd820c377e89114b75ee2 2.6.3
72+
246ce68795ea9caeb88ec2fa17e4f3151c58cf3f 2.6.3
73+
ea378ef00313cd77d251e61b4c0422503972b79f 2.7
74+
b20cf787d8e1c167853709ca01731a3efb4b5fe8 2.7.1
75+
7e0abe005937033aaf5d00fe3db3c94addecef7b 2.8
76+
7e0abe005937033aaf5d00fe3db3c94addecef7b 2.8
77+
279244c0fa41a327cc534fc40e9e7fadea180c23 2.8

‎ChangeLog

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
2011-04-13 Doug Hellmann <[email protected]>
2+
3+
* virtualenvwrapper.sh (rmvirtualenv): Move to a safe directory
4+
before removing the virtual environment, and only move back if the
5+
previously occupied directory still exists.
6+
7+
2011-04-10 Doug Hellmann <[email protected]>
8+
9+
* virtualenvwrapper.sh: Initialize VIRTUALENVWRAPPER_LOG_DIR and
10+
VIRTUALENVWRAPPER_HOOK_DIR.
11+
12+
* virtualenvwrapper/hook_loader.py (main): Use
13+
VIRTUALENVWRAPPER_LOG_DIR for logs instead of assuming
14+
WORKON_HOME.
15+
16+
* virtualenvwrapper/user_scripts.py (make_hook): Change verbosity
17+
of message telling the user we have created a new hook script for
18+
them.
19+
20+
2011-02-26 Doug Hellmann <[email protected]>
21+
22+
* docs/sphinx/conf.py: Just hard-code the version.
23+
24+
* setup.py: Just hard-code the version.
25+
26+
* virtualenvwrapper/version.py: Put the version info inside the
27+
package so it is available to the doc build and packaging
28+
script. This also makes the readthedocs.org build work properly.
29+
30+
* setup.py: Import the version information from the package.
31+
32+
* docs/sphinx/conf.py: Import the version information from the
33+
package.
34+
35+
* Makefile: Remove rule to get the version from the installer for
36+
the doc build.
37+
38+
2011-01-24 Doug Hellmann <[email protected]>
39+
40+
* virtualenvwrapper.sh: Replace hard-coded name "virtualenv" with
41+
the variable VIRTUALENVWRAPPER_VIRTUALENV to allow tests (and
42+
users) to override it.
43+
44+
* tests/test_mkvirtualenv.sh (test_virtualenv_fails): Add a test
45+
to reproduce the conditions reported in issue #76.
46+
47+
2010-12-27 Doug Hellmann <[email protected]>
48+
49+
* virtualenvwrapper.sh (virtualenvwrapper_get_python_version):
50+
Only include the major and minor numbers, not the patch level.
51+
52+
2010-12-26 Doug Hellmann <[email protected]>
53+
54+
* virtualenvwrapper/user_scripts.py (make_hook): Do not specify
55+
text mode when creating the files so cygwin will not replace \n
56+
with \r\n.
57+
58+
* setup.py: Change "requires" to "install_requires" so pip will
59+
try to install virtualenv if it is not already there. Add trove
60+
classifiers for the supported Python versions.
61+
62+
* virtualenvwrapper.sh (virtualenvwrapper_get_python_version): Use
63+
python's -V option and cut to get the version instead of a python
64+
one-liner.
65+
66+
2010-12-24 Doug Hellmann <[email protected]>
67+
68+
* virtualenvwrapper.sh (cpvirtualenv): Ensure that both pre hooks
69+
are run, even if one produces an error.
70+
71+
* virtualenvwrapper/user_scripts.py: Change log message format.
72+
73+
* tox.ini: Configuration file for running tests under tox.
74+
75+
* tests/test_run_hook.sh (test_virtualenvwrapper_run_hook_permissions):
76+
Fix the expected output message.
77+
78+
* tests/*: Make sure all of the test scripts have execute permission.
79+
80+
* tests/test.sh (test_virtualenvwrapper_verify_workon_home_missing_dir_quiet_init):
81+
Use source instead of starting another shell, since zsh doesn't
82+
play nicely with inheriting environment settings otherwise.
83+
(test_python_interpreter_set_incorrectly): Force
84+
VIRTUALENVWRAPPER_PYTHON before running the script in a sub-shell.
85+
86+
* tests/run_tests: Script to run through all of the other test
87+
scripts one at a time.
88+
89+
2010-09-18 Doug Hellmann <[email protected]>
90+
91+
* virtualenvwrapper.sh: Apply patch from Zach Voase to fix
92+
lsvirtualenv under zsh.
93+
94+
2010-09-14 Doug Hellmann <[email protected]>
95+
96+
* virtualenvwrapper.sh (workon): Use the brief list format by
97+
default.
98+
99+
2010-08-16 Doug Hellmann <[email protected]>
100+
101+
* virtualenvwrapper/user_scripts.py (get_env_details): New hook to
102+
optionally give more detail than the name of an environment when
103+
the user requests a list.
104+
105+
* virtualenvwrapper.sh: Update workon to use the get_env_details
106+
hook to print more details, if the user provides scripts to give
107+
them.
108+
109+
2010-06-03 Doug Hellmann <[email protected]>
110+
111+
* virtualenvwrapper.sh: Escape the call to "which" so we don't use
112+
an alias by accident.
113+
114+
2010-05-22 Doug Hellmann <[email protected]>
115+
116+
* tests/test_cp.sh: Clarify some of the tests by breaking up,
117+
renaming, and rewriting some functions.
118+
119+
* Makefile (PYTHON26): If we're in a virtualenv when the tests
120+
start, use a hard-coded path to the binary to get the global
121+
version.
122+
123+
2010-05-18 Doug Hellmann <[email protected]>
124+
125+
* virtualenvwrapper.sh (virtualenvwrapper_tempfile): Use a trap to
126+
ensure the temporary file is removed when we exit.
127+
128+
2010-05-16 Doug Hellmann <[email protected]>
129+
130+
* virtualenvwrapper.sh (virtualenvwrapper_tempfile): Set a default
131+
suffix of "hook" and explicitly report when we detect an error
132+
condition.
133+
134+
* Makefile (PYTHON26): Use which to find python2.6, the default
135+
interpreter, so we can run the tests as "make test-quick" on other
136+
hosts.
137+
138+
* tests/test_tempfile.sh (test_tempfile): Normalize the paths so
139+
we don't depend on the value of TMPDIR or behavior of dirname.
140+
141+
* tests/test_cd.sh: Make sure the virtualenv from the caller does
142+
not influence test behaviors by establishing our own virtualenv
143+
locally.
144+
145+
* virtualenvwrapper/hook_loader.py (main): Add more debug logging
146+
to try to narrow down the tempfile issue (#35).
147+
(run_hooks): Insert a comment into the output file to show which
148+
hook we are running.
149+
150+
* virtualenvwrapper.sh (virtualenvwrapper_run_hook): Add more
151+
debugging error reporting to try to narrow down the tempfile
152+
issue (#35).
153+
154+
2010-05-09 Doug Hellmann <[email protected]>
155+
156+
* virtualenvwrapper.sh: Tweak path normalization code so double
157+
slashes are also removed from WORKON_HOME. Use typeset for local
158+
variables.
159+
(virtualenvwrapper_tempfile): Add -t option to mktemp so the new
160+
files are always created in the user's temporary directory.
161+
(virtualenvwrapper_run_hook): Add the hook name to the temporary
162+
file name.
163+
164+
* tests/test_tempfile.sh: Remove obsolete test. Fix assertions
165+
for remaining test.
166+
167+
* tests/test_mkvirtualenv.sh (test_hooks): Use pwd to convert
168+
WORKON_HOME to the expected value.
169+
170+
* tests/test.sh (test_python_interpreter_set_incorrectly): Rework
171+
grep-based assertion to actually pass.
172+
173+
* Makefile (test-bash test-ksh test-sh): Remove wildcard build
174+
rule so test-quick target works.
175+
176+
2010-05-02 Doug Hellmann <[email protected]>
177+
178+
* virtualenvwrapper.sh (virtualenvwrapper_run_hook): Instead of
179+
-m, use -c so hooks can be run under Python 2.4.
180+
181+
2010-04-29 Doug Hellmann <[email protected]>
182+
183+
* tests/test_workon.sh: Refactor deactivate tests into their own
184+
script.
185+
186+
* tests/test_deactivate.sh: Refactor deactivate tests into their
187+
own script.
188+
189+
* virtualenvwrapper.sh (virtualenvwrapper_get_python_version): Add
190+
a comment about why we're using the $PATH python instead of the
191+
one where the wrappers are installed.
192+
(add2virtualenv): Use the install-tree python instead of the one
193+
from $PATH.
194+
(deactivate): Ignore errors from redundant unset calls.
195+
196+
2010-04-26 Doug Hellmann <[email protected]>
197+
198+
* virtualenvwrapper.sh (virtualenvwrapper_tempfile): Add a suffix
199+
to the tempfile name so we know the tempfile module isn't going to
200+
erase it.

‎MANIFEST.in

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
include setup.py
2-
include paver-minilib.zip
3-
include pavement.py
2+
include distribute_setup.py
43
include tests/*
5-
recursive-include virtualenvwrapper *.html *.txt *.css *.js *.png
6-
recursive-include docsource *.rst
4+
recursive-include docs *.rst *.py *.html *.css *.js *.png *.txt
5+

‎Makefile

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Default target is to show help
2+
help:
3+
@echo "sdist - Source distribution"
4+
@echo "html - HTML documentation"
5+
@echo "docclean - Remove documentation build files"
6+
@echo "upload - upload a new release to PyPI"
7+
@echo "develop - install development version"
8+
@echo "test - run the test suite"
9+
@echo "test-quick - run the test suite for bash and one version of Python ($(PYTHON26))"
10+
@echo "website - generate web version of the docs"
11+
@echo "installwebsite - copy web version of HTML docs up to server"
12+
13+
.PHONY: sdist
14+
sdist: html
15+
rm -f dist/*.gz
16+
rm -rf docs/website
17+
python setup.py sdist
18+
cp -v dist/*.gz ~/Desktop
19+
20+
# Documentation
21+
.PHONY: html
22+
html:
23+
(cd docs && $(MAKE) html LANGUAGE="en")
24+
(cd docs && $(MAKE) html LANGUAGE="es")
25+
(cd docs && $(MAKE) html LANGUAGE="ja")
26+
27+
.PHONY: docclean
28+
docclean:
29+
rm -rf docs/build docs/html
30+
31+
# Website copy of documentation
32+
.PHONY: website
33+
website:
34+
[ ~/Devel/doughellmann/doughellmann/templates/base.html -nt docs/sphinx/web/templates/base.html ] && (echo "Updating base.html" ; cp ~/Devel/doughellmann/doughellmann/templates/base.html docs/sphinx/web/templates/base.html) || exit 0
35+
rm -rf docs/website
36+
(cd docs && $(MAKE) html BUILDDIR="website/en" LANGUAGE="en")
37+
(cd docs && $(MAKE) html BUILDDIR="website/es" LANGUAGE="es")
38+
(cd docs && $(MAKE) html BUILDDIR="website/ja" LANGUAGE="ja")
39+
40+
installwebsite: website
41+
(cd docs/website/en && rsync --rsh=ssh --archive --delete --verbose . www.doughellmann.com:/var/www/doughellmann/DocumentRoot/docs/virtualenvwrapper/)
42+
(cd docs/website/es && rsync --rsh=ssh --archive --delete --verbose . www.doughellmann.com:/var/www/doughellmann/DocumentRoot/docs/virtualenvwrapper/es/)
43+
(cd docs/website/ja && rsync --rsh=ssh --archive --delete --verbose . www.doughellmann.com:/var/www/doughellmann/DocumentRoot/docs/virtualenvwrapper/ja/)
44+
45+
# Register the new version on pypi
46+
.PHONY: register
47+
register:
48+
echo "USE upload target"
49+
exit 1
50+
python setup.py register
51+
52+
.PHONY: upload
53+
upload:
54+
python setup.py sdist upload
55+
56+
# Testing
57+
test:
58+
tox
59+
60+
test-quick:
61+
tox -e py27
62+
63+
develop:
64+
python setup.py develop

0 commit comments

Comments
 (0)