Skip to content

Commit be98ae3

Browse files
committed
Merge branch 'release/v0.1.4'
2 parents c14e294 + eda88e7 commit be98ae3

File tree

176 files changed

+3917
-2783
lines changed

Some content is hidden

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

176 files changed

+3917
-2783
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
*.pyc
22
.DS_Store
3+
.coverage
34
.idea
45
.ipynb_checkpoints/
56
__pycache__
67
build
78
colour_hdri.egg-info
89
dist
9-
docs/_build
10+
docs/_build

.landscape.yml

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

.style.yapf

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
[style]
2+
# Align closing bracket with visual indentation.
3+
align_closing_bracket_with_visual_indent=True
4+
5+
# Allow dictionary keys to exist on multiple lines. For example:
6+
#
7+
# x = {
8+
# ('this is the first element of a tuple',
9+
# 'this is the second element of a tuple'):
10+
# value,
11+
# }
12+
allow_multiline_dictionary_keys=False
13+
14+
# Allow lambdas to be formatted on more than one line.
15+
allow_multiline_lambdas=False
16+
17+
# Insert a blank line before a class-level docstring.
18+
blank_line_before_class_docstring=False
19+
20+
# Insert a blank line before a 'def' or 'class' immediately nested
21+
# within another 'def' or 'class'. For example:
22+
#
23+
# class Foo:
24+
# # <------ this blank line
25+
# def method():
26+
# ...
27+
blank_line_before_nested_class_or_def=False
28+
29+
# Do not split consecutive brackets. Only relevant when
30+
# dedent_closing_brackets is set. For example:
31+
#
32+
# call_func_that_takes_a_dict(
33+
# {
34+
# 'key1': 'value1',
35+
# 'key2': 'value2',
36+
# }
37+
# )
38+
#
39+
# would reformat to:
40+
#
41+
# call_func_that_takes_a_dict({
42+
# 'key1': 'value1',
43+
# 'key2': 'value2',
44+
# })
45+
coalesce_brackets=False
46+
47+
# The column limit.
48+
column_limit=79
49+
50+
# Indent width used for line continuations.
51+
continuation_indent_width=4
52+
53+
# Put closing brackets on a separate line, dedented, if the bracketed
54+
# expression can't fit in a single line. Applies to all kinds of brackets,
55+
# including function definitions and calls. For example:
56+
#
57+
# config = {
58+
# 'key1': 'value1',
59+
# 'key2': 'value2',
60+
# } # <--- this bracket is dedented and on a separate line
61+
#
62+
# time_series = self.remote_client.query_entity_counters(
63+
# entity='dev3246.region1',
64+
# key='dns.query_latency_tcp',
65+
# transform=Transformation.AVERAGE(window=timedelta(seconds=60)),
66+
# start_ts=now()-timedelta(days=3),
67+
# end_ts=now(),
68+
# ) # <--- this bracket is dedented and on a separate line
69+
dedent_closing_brackets=False
70+
71+
# Place each dictionary entry onto its own line.
72+
each_dict_entry_on_separate_line=True
73+
74+
# The regex for an i18n comment. The presence of this comment stops
75+
# reformatting of that line, because the comments are required to be
76+
# next to the string they translate.
77+
i18n_comment=
78+
79+
# The i18n function call names. The presence of this function stops
80+
# reformattting on that line, because the string it has cannot be moved
81+
# away from the i18n comment.
82+
i18n_function_call=
83+
84+
# Indent the dictionary value if it cannot fit on the same line as the
85+
# dictionary key. For example:
86+
#
87+
# config = {
88+
# 'key1':
89+
# 'value1',
90+
# 'key2': value1 +
91+
# value2,
92+
# }
93+
indent_dictionary_value=True
94+
95+
# The number of columns to use for indentation.
96+
indent_width=4
97+
98+
# Join short lines into one line. E.g., single line 'if' statements.
99+
join_multiple_lines=True
100+
101+
# Use spaces around default or named assigns.
102+
spaces_around_default_or_named_assign=False
103+
104+
# Use spaces around the power operator.
105+
spaces_around_power_operator=True
106+
107+
# The number of spaces required before a trailing comment.
108+
spaces_before_comment=2
109+
110+
# Insert a space between the ending comma and closing bracket of a list,
111+
# etc.
112+
space_between_ending_comma_and_closing_bracket=True
113+
114+
# Split before arguments if the argument list is terminated by a
115+
# comma.
116+
split_arguments_when_comma_terminated=False
117+
118+
# Set to True to prefer splitting before '&', '|' or '^' rather than
119+
# after.
120+
split_before_bitwise_operator=False
121+
122+
# Split before a dictionary or set generator (comp_for). For example, note
123+
# the split before the 'for':
124+
#
125+
# foo = {
126+
# variable: 'Hello world, have a nice day!'
127+
# for variable in bar if variable != 42
128+
# }
129+
split_before_dict_set_generator=True
130+
131+
# If an argument / parameter list is going to be split, then split before
132+
# the first argument.
133+
split_before_first_argument=False
134+
135+
# Set to True to prefer splitting before 'and' or 'or' rather than
136+
# after.
137+
split_before_logical_operator=False
138+
139+
# Split named assignments onto individual lines.
140+
split_before_named_assigns=True
141+
142+
# The penalty for splitting right after the opening bracket.
143+
split_penalty_after_opening_bracket=30
144+
145+
# The penalty for splitting the line after a unary operator.
146+
split_penalty_after_unary_operator=10000
147+
148+
# The penalty for splitting right before an if expression.
149+
split_penalty_before_if_expr=0
150+
151+
# The penalty of splitting the line around the '&', '|', and '^'
152+
# operators.
153+
split_penalty_bitwise_operator=300
154+
155+
# The penalty for characters over the column limit.
156+
split_penalty_excess_character=4500
157+
158+
# The penalty incurred by adding a line split to the unwrapped line. The
159+
# more line splits added the higher the penalty.
160+
split_penalty_for_added_line_split=30
161+
162+
# The penalty of splitting a list of "import as" names. For example:
163+
#
164+
# from a_very_long_or_indented_module_name_yada_yad import (long_argument_1,
165+
# long_argument_2,
166+
# long_argument_3)
167+
#
168+
# would reformat to something like:
169+
#
170+
# from a_very_long_or_indented_module_name_yada_yad import (
171+
# long_argument_1, long_argument_2, long_argument_3)
172+
split_penalty_import_names=0
173+
174+
# The penalty of splitting the line around the 'and' and 'or'
175+
# operators.
176+
split_penalty_logical_operator=300
177+
178+
# Use the Tab character for indentation.
179+
use_tabs=False
180+

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ matrix:
77
- python: 2.7
88
env:
99
- PYTHON_VERSION="2.7"
10+
- NUMPY_VERSION="1.13.3"
1011

1112
notifications:
1213
slack: colour-science:Y6lPPcN7y53Js94geqUpqsAP
@@ -30,8 +31,9 @@ before_install:
3031
- "export DISPLAY=:99.0"
3132
- "sh -e /etc/init.d/xvfb start"
3233
- PACKAGES="python=${PYTHON_VERSION}"
33-
- PACKAGES="${PACKAGES} scipy"; if [ ${SCIPY_VERSION} ]; then PACKAGES="${PACKAGES}=${SCIPY_VERSION}"; fi
34+
- PACKAGES="${PACKAGES} numpy"; if [ ${NUMPY_VERSION} ]; then PACKAGES="${PACKAGES}=${NUMPY_VERSION}"; fi
3435
- PACKAGES="${PACKAGES} matplotlib"; if [ ${MATPLOTLIB_VERSION} ]; then PACKAGES="${PACKAGES}=${MATPLOTLIB_VERSION}"; fi
36+
- PACKAGES="${PACKAGES} scipy"; if [ ${SCIPY_VERSION} ]; then PACKAGES="${PACKAGES}=${SCIPY_VERSION}"; fi
3537
# TODO: Investigate reason why *dcraw* cannot be installed along other packages.
3638
- sudo apt-get install dcraw
3739
- wget https://github.com/OpenImageIO/oiio/archive/Release-1.5.21.tar.gz -O /tmp/OpenImageIO-1.5.21.tar.gz
@@ -50,7 +52,7 @@ install:
5052

5153
script:
5254
- flake8 colour_hdri
53-
- nosetests --nocapture --with-doctest --doctest-options=+ELLIPSIS,+NORMALIZE_WHITESPACE --with-coverage --cover-package=colour_hdri -exclude-dir=
55+
- nosetests --nocapture --with-doctest --doctest-options=+ELLIPSIS,+NORMALIZE_WHITESPACE --with-coverage --cover-package=colour_hdri colour_hdri
5456

5557
after_success:
5658
- coveralls

0 commit comments

Comments
 (0)