Skip to content

Commit c6dd4ff

Browse files
committed
convert to Pipfile
1 parent 97455c0 commit c6dd4ff

File tree

4 files changed

+30
-149
lines changed

4 files changed

+30
-149
lines changed

.tmuxp.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
11
session_name: tmuxp
22
start_directory: ./ # load session relative to config location (project root).
3-
before_script: ./bootstrap_env.py # ./ to load relative to project root.
3+
before_script: pipenv install --dev --skip-lock
4+
shell_command_before:
5+
- '[ -d `pipenv --venv` ] && source `pipenv --venv`/bin/activate && reset'
46
windows:
57
- window_name: tmuxp
68
focus: True
79
layout: main-horizontal
810
options:
911
main-pane-height: 35
10-
shell_command_before:
11-
- '[ -d .venv -a -f .venv/bin/activate ] && source .venv/bin/activate'
1212
panes:
1313
- focus: true
1414
- pane
1515
- make watch_test
16-
1716
- window_name: docs
1817
layout: main-horizontal
1918
options:
2019
main-pane-height: 35
2120
start_directory: doc/
22-
shell_command_before:
23-
- '[ -d ../.venv -a -f ../.venv/bin/activate ] && source ../.venv/bin/activate'
2421
panes:
2522
- focus: true
2623
- pane

Pipfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[[source]]
2+
url = "https://pypi.python.org/simple"
3+
verify_ssl = true
4+
name = "pypi"
5+
6+
[packages]
7+
8+
[dev-packages]
9+
10+
kaptan = ">=0.5.7"
11+
libtmux = "==0.7.5"
12+
click = "==6.7"
13+
colorama = "==0.3.9"
14+
docutils = "==0.14"
15+
Sphinx = ">=1.5.0"
16+
alagitpull = "==0.0.13"
17+
releases = "==1.3.1"
18+
aafigure = "==0.6"

bootstrap_env.py

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

doc/_ext/aafig.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
:license: BOLA, see LICENSE for details
1313
"""
1414

15+
from __future__ import unicode_literals
16+
1517
import posixpath
1618
from os import path
1719

@@ -46,8 +48,8 @@ def get_basename(text, options, prefix='aafig'):
4648
options = options.copy()
4749
if 'format' in options:
4850
del options['format']
49-
hashkey = text.encode('utf-8') + str(options)
50-
id = sha(hashkey).hexdigest()
51+
hashkey = text + str(options)
52+
id = sha(hashkey.encode('utf-8')).hexdigest()
5153
return '%s-%s' % (prefix, id)
5254

5355

@@ -75,7 +77,7 @@ class AafigDirective(images.Image):
7577

7678
def run(self):
7779
aafig_options = dict()
78-
own_options_keys = self.own_option_spec.keys() + ['scale']
80+
own_options_keys = [self.own_option_spec.keys()] + ['scale']
7981
for (k, v) in self.options.items():
8082
if k in own_options_keys:
8183
# convert flags to booleans
@@ -123,7 +125,7 @@ def render_aafig_images(app, doctree):
123125
continue
124126
try:
125127
fname, outfn, id, extra = render_aafigure(app, text, options)
126-
except AafigError, exc:
128+
except AafigError as exc:
127129
app.builder.warn('aafigure error: ' + str(exc))
128130
img.replace_self(nodes.literal_block(text, text))
129131
continue
@@ -171,7 +173,7 @@ def render_aafigure(app, text, options):
171173
f = None
172174
try:
173175
try:
174-
f = file(metadata_fname, 'r')
176+
f = open(metadata_fname, 'r')
175177
extra = f.read()
176178
except:
177179
raise AafigError()
@@ -187,13 +189,13 @@ def render_aafigure(app, text, options):
187189
try:
188190
(visitor, output) = aafigure.render(text, outfn, options)
189191
output.close()
190-
except aafigure.UnsupportedFormatError, e:
192+
except aafigure.UnsupportedFormatError as e:
191193
raise AafigError(str(e))
192194

193195
extra = None
194196
if options['format'].lower() == 'svg':
195197
extra = visitor.get_size_attrs()
196-
f = file(metadata_fname, 'w')
198+
f = open(metadata_fname, 'w')
197199
f.write(extra)
198200
f.close()
199201

0 commit comments

Comments
 (0)