Skip to content

Commit 7d6e594

Browse files
committed
remove BOKEH_DEFAULT_NO_DEV cruft
1 parent 959516a commit 7d6e594

File tree

3 files changed

+4
-24
lines changed

3 files changed

+4
-24
lines changed

.travis.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,11 @@ env:
2020
matrix:
2121
include:
2222
- python: 2.7
23-
env: BOKEH_DEFAULT_NO_DEV=true BOKEH_DEFAULT_DIFF=FETCH_HEAD
23+
env: BOKEH_DEFAULT_DIFF=FETCH_HEAD
2424
- python: 3.3
25-
env: BOKEH_DEFAULT_NO_DEV=true
2625
- python: 3.4
27-
env: BOKEH_DEFAULT_NO_DEV=true
2826
exclude:
2927
- python: 2.7
30-
- python: 3.3
31-
- python: 3.4
3228

3329
branches:
3430
only:
@@ -55,7 +51,7 @@ script:
5551

5652
after_success:
5753
|
58-
if [[ ! -z "$TRAVIS_TAG" && $BOKEH_DEFAULT_NO_DEV == true ]]; then
54+
if [[ ! -z "$TRAVIS_TAG" ]]; then
5955
echo "Building the packages and uploading to binstar. Also uploading JS and CSS to the CDN and uploading the devel docs."
6056
conda install binstar fabric --yes
6157
openssl aes-256-cbc -K $encrypted_d63f580d5c2a_key -iv $encrypted_d63f580d5c2a_iv -in secrets.tar.enc -out secrets.tar -d
@@ -71,7 +67,7 @@ after_success:
7167
bash release_upload.sh -b $BINSTAR_TOKEN
7268
fi
7369
else
74-
echo "Not building because there is no tag (or BOKEH_DEFAULT_NO_DEV is false)."
70+
echo "Not building because there is no tag."
7571
fi
7672

7773
notifications:

sphinx/source/docs/dev_guide/testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ from the top level directory by executing:
3838

3939
.. code-block:: sh
4040
41-
BOKEH_DEFAULT_NO_DEV=True nosetests
41+
nosetests
4242
4343
.. note::
4444
Currently this script does not support Windows.

tests/travis/test

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ parser.add_argument("-t", "--timeout", type=int, default=default_timeout,
6262
help="how long can an example run (in seconds)")
6363
parser.add_argument("-v", "--verbose", action="store_true", default=False,
6464
help="show console messages")
65-
parser.add_argument("-D", "--no-dev", dest="dev", action="store_false", default=True,
66-
help="don't use development JavaScript and CSS files")
6765
parser.add_argument("-all-n", "--all-notebooks", action="store_true", default=False,
6866
help="test all the notebooks inside examples/plotting/notebook folder.")
6967
parser.add_argument("-o", "--output-cells", type=str, choices=['complain', 'remove', 'ignore'], default='complain',
@@ -111,21 +109,13 @@ def ok(msg=None):
111109
msg = " " + msg if msg is not None else ""
112110
write("%s%s" % (green("[OK]"), msg))
113111

114-
DEFAULT_NO_DEV = os.environ.get('BOKEH_DEFAULT_NO_DEV', 'false')
115-
if DEFAULT_NO_DEV.lower() in ["true", "yes", "on", "1"]:
116-
args.dev = False
117-
elif DEFAULT_NO_DEV.lower() not in ["false", "no", "off", "0"]:
118-
write("unexpected value for BOKEH_DEFAULT_NO_DEV environmental variable, %s" % DEFAULT_NO_DEV)
119-
sys.exit(1)
120-
121112
write("%s Using configuration:" % green(">>>"))
122113
write("%s patterns = %s" % (green("---"), args.patterns))
123114
write("%s bokeh-port = %s" % (green("---"), args.bokeh_port))
124115
write("%s ipython-port = %s" % (green("---"), args.ipython_port))
125116
write("%s phantomjs = %s" % (green("---"), args.phantomjs))
126117
write("%s timeout = %s" % (green("---"), args.timeout))
127118
write("%s verbose = %s" % (green("---"), args.verbose))
128-
write("%s dev = %s" % (green("---"), args.dev))
129119
write("%s all-notebooks = %s" % (green("---"), args.all_notebooks))
130120
write("%s output-cells = %s" % (green("---"), args.output_cells))
131121
write("%s log-file = %s" % (green("---"), args.log_file.name))
@@ -281,9 +271,6 @@ def make_env():
281271
env = os.environ.copy()
282272
env['BOKEH_RESOURCES'] = 'relative'
283273
env['BOKEH_BROWSER'] = 'none'
284-
if args.dev:
285-
env['BOKEH_RESOURCES'] += '-dev'
286-
env['BOKEH_PRETTY'] = 'yes'
287274
return env
288275

289276
class Timeout(Exception):
@@ -461,9 +448,6 @@ def start_bokeh_server():
461448
cmd = ["python", "-c", "import bokeh.server; bokeh.server.run()"]
462449
argv = ["--bokeh-port=%s" % args.bokeh_port, "--backend=memory"]
463450

464-
if args.dev:
465-
argv.extend(["--splitjs", "--debugjs", "--filter-logs"])
466-
467451
try:
468452
proc = subprocess.Popen(cmd + argv, stdout=args.log_file, stderr=args.log_file)
469453
except OSError:

0 commit comments

Comments
 (0)