Skip to content

Commit ba43db8

Browse files
author
Jonathan DEKHTIAR
authored
Tl logging layer name fix (#683)
* TL logging Layer Name Error Fix * 1.8.6rc3 release * setup.cfg travis improvements * YAPF formating * unstack_layer fx converted to Layer Class UnstackLayer * Missing self.name fixed
1 parent b8d69bb commit ba43db8

26 files changed

+306
-130
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ install:
6161
script:
6262
# units test
6363
# https://docs.pytest.org/en/latest/
64-
- if [[ -v _DOC_AND_YAPF_TEST ]]; then python tests/test_documentation.py; python tests/test_yapf_format.py; else pytest; fi
64+
- rm setup.cfg
65+
- if [[ -v _DOC_AND_YAPF_TEST ]]; then mv setup.travis_doc.cfg setup.cfg; else mv setup.travis.cfg setup.cfg; fi
66+
- pytest
6567

6668

6769
before_deploy:

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ To release a new version, please update the changelog as followed:
223223
- All the tests are now using a DEBUG level verbosity when run individualy (by @DEKHTIARJonathan in #660)
224224
- `tf.identity` as activation is **ignored**, thus reducing the size of the graph by removing useless operation (by @DEKHTIARJonathan in #667)
225225
- argument dictionaries are now checked and saved within the `Layer` Base Class (by @DEKHTIARJonathan in #667)
226+
- `unstack_layer` function transformed into Class `UnStackLayer` (by @DEKHTIARJonathan in #683)
226227

227228
### Deprecated
228229
- `tl.layers.TimeDistributedLayer` argurment `args` is deprecated in favor of `layer_args` (by @DEKHTIARJonathan in #667)
@@ -293,5 +294,5 @@ To release a new version, please update the changelog as followed:
293294
@zsdonghao @luomai @DEKHTIARJonathan
294295

295296
[Unreleased]: https://github.com/tensorlayer/tensorlayer/compare/1.8.5...master
296-
[1.8.6]: https://github.com/tensorlayer/tensorlayer/compare/1.8.6rc2...1.8.5
297+
[1.8.6]: https://github.com/tensorlayer/tensorlayer/compare/1.8.6rc3...1.8.5
297298
[1.8.5]: https://github.com/tensorlayer/tensorlayer/compare/1.8.4...1.8.5

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
![PyPI Stable Version](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/github/release/tensorlayer/tensorlayer.svg?label=PyPI%20-%20Release)
1616
![PyPI RC Version](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/github/release/tensorlayer/tensorlayer/all.svg?label=PyPI%20-%20Pre-Release)
17-
[![Github commits (since latest release)](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/github/commits-since/tensorlayer/tensorlayer/latest.svg)](https://github.com/tensorlayer/tensorlayer/compare/1.8.6rc2...master)
17+
[![Github commits (since latest release)](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/github/commits-since/tensorlayer/tensorlayer/latest.svg)](https://github.com/tensorlayer/tensorlayer/compare/1.8.6rc3...master)
1818
[![PyPI - Python Version](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/pypi/pyversions/tensorlayer.svg)](https://pypi.org/project/tensorlayer/)
1919
[![Supported TF Version](http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/badge/tensorflow-1.6.0+-blue.svg)](https://github.com/tensorflow/tensorflow/releases)
2020

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
:target: https://pypi.org/project/tensorlayer/
4141

4242
.. image:: http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/github/commits-since/tensorlayer/tensorlayer/latest.svg
43-
:target: https://github.com/tensorlayer/tensorlayer/compare/1.8.6rc2...master
43+
:target: https://github.com/tensorlayer/tensorlayer/compare/1.8.6rc3...master
4444

4545
.. image:: http://ec2-35-178-47-120.eu-west-2.compute.amazonaws.com/pypi/pyversions/tensorlayer.svg
4646
:target: https://pypi.org/project/tensorlayer/

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# documentation root, use os.path.abspath to make it absolute, like shown here.
1919
#
2020
import os, sys
21-
sys.path.insert(0, os.path.abspath("../")) # Important
21+
sys.path.insert(0, os.path.abspath("../")) # Important
2222

2323
from tensorlayer import __shortversion__
2424
from tensorlayer import __version__

docs/modules/layers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@ Stack layer
815815

816816
Unstack layer
817817
^^^^^^^^^^^^^^^
818-
.. autofunction:: UnStackLayer
818+
.. autoclass:: UnStackLayer
819819

820820
..
821821
Estimator layer

setup.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
[tool:pytest]
22
testpaths = tests/
3-
addopts = --ignore=tests/test_documentation.py
4-
--ignore=tests/test_yapf_format.py
53

64
[flake8]
75
max-line-length = 120

setup.travis.cfg

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
[tool:pytest]
2+
testpaths = tests/
3+
addopts = --ignore=tests/test_documentation.py
4+
--ignore=tests/test_yapf_format.py
5+
6+
[flake8]
7+
max-line-length = 120
8+
ignore =
9+
D301
10+
E221 # Space before equal sign
11+
E251 # Space after equal sign
12+
exclude =
13+
.git,
14+
venv,
15+
__pycache__,
16+
.pytest_cache,
17+
tensorlayer.egg-info,
18+
build,
19+
dist,
20+
img
21+
22+
[yapf]
23+
based_on_style=google
24+
25+
# The number of columns to use for indentation.
26+
indent_width = 4
27+
28+
# The column limit.
29+
column_limit=120
30+
31+
# Place each dictionary entry onto its own line.
32+
each_dict_entry_on_separate_line = True
33+
34+
# Put closing brackets on a separate line, dedented, if the bracketed
35+
# expression can't fit in a single line. Applies to all kinds of brackets,
36+
# including function definitions and calls. For example:
37+
#
38+
# config = {
39+
# 'key1': 'value1',
40+
# 'key2': 'value2',
41+
# } # <--- this bracket is dedented and on a separate line
42+
#
43+
# time_series = self.remote_client.query_entity_counters(
44+
# entity='dev3246.region1',
45+
# key='dns.query_latency_tcp',
46+
# transform=Transformation.AVERAGE(window=timedelta(seconds=60)),
47+
# start_ts=now()-timedelta(days=3),
48+
# end_ts=now(),
49+
# ) # <--- this bracket is dedented and on a separate line
50+
dedent_closing_brackets=True
51+
52+
# Do not split consecutive brackets. Only relevant when DEDENT_CLOSING_BRACKETS is set
53+
coalesce_brackets = False
54+
55+
# Align closing bracket with visual indentation.
56+
align_closing_bracket_with_visual_indent = False
57+
58+
# Split named assignments onto individual lines.
59+
split_before_named_assigns = False
60+
61+
# If an argument / parameter list is going to be split, then split before the first argument.
62+
split_before_first_argument = True
63+
64+
# Split before arguments if the argument list is terminated by a comma.
65+
split_arguments_when_comma_terminated = False
66+
67+
# Insert a space between the ending comma and closing bracket of a list, etc.
68+
space_between_ending_comma_and_closing_bracket = True
69+
70+
# Join short lines into one line. E.g., single line if statements.
71+
join_multiple_lines = True
72+
73+
# Do not include spaces around selected binary operators.
74+
# Example: 1 + 2 * 3 - 4 / 5 => 1 + 2*3 - 4/5
75+
no_spaces_around_selected_binary_operators = True
76+
77+
# Allow lambdas to be formatted on more than one line.
78+
allow_multiline_lambdas = True
79+
80+
SPLIT_PENALTY_FOR_ADDED_LINE_SPLIT = 10
81+
SPLIT_PENALTY_AFTER_OPENING_BRACKET = 500

setup.travis_doc.cfg

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
[tool:pytest]
2+
testpaths = tests/
3+
python_files=*test_documentation*
4+
*test_yapf_format*
5+
6+
[flake8]
7+
max-line-length = 120
8+
ignore =
9+
D301
10+
E221 # Space before equal sign
11+
E251 # Space after equal sign
12+
exclude =
13+
.git,
14+
venv,
15+
__pycache__,
16+
.pytest_cache,
17+
tensorlayer.egg-info,
18+
build,
19+
dist,
20+
img
21+
22+
[yapf]
23+
based_on_style=google
24+
25+
# The number of columns to use for indentation.
26+
indent_width = 4
27+
28+
# The column limit.
29+
column_limit=120
30+
31+
# Place each dictionary entry onto its own line.
32+
each_dict_entry_on_separate_line = True
33+
34+
# Put closing brackets on a separate line, dedented, if the bracketed
35+
# expression can't fit in a single line. Applies to all kinds of brackets,
36+
# including function definitions and calls. For example:
37+
#
38+
# config = {
39+
# 'key1': 'value1',
40+
# 'key2': 'value2',
41+
# } # <--- this bracket is dedented and on a separate line
42+
#
43+
# time_series = self.remote_client.query_entity_counters(
44+
# entity='dev3246.region1',
45+
# key='dns.query_latency_tcp',
46+
# transform=Transformation.AVERAGE(window=timedelta(seconds=60)),
47+
# start_ts=now()-timedelta(days=3),
48+
# end_ts=now(),
49+
# ) # <--- this bracket is dedented and on a separate line
50+
dedent_closing_brackets=True
51+
52+
# Do not split consecutive brackets. Only relevant when DEDENT_CLOSING_BRACKETS is set
53+
coalesce_brackets = False
54+
55+
# Align closing bracket with visual indentation.
56+
align_closing_bracket_with_visual_indent = False
57+
58+
# Split named assignments onto individual lines.
59+
split_before_named_assigns = False
60+
61+
# If an argument / parameter list is going to be split, then split before the first argument.
62+
split_before_first_argument = True
63+
64+
# Split before arguments if the argument list is terminated by a comma.
65+
split_arguments_when_comma_terminated = False
66+
67+
# Insert a space between the ending comma and closing bracket of a list, etc.
68+
space_between_ending_comma_and_closing_bracket = True
69+
70+
# Join short lines into one line. E.g., single line if statements.
71+
join_multiple_lines = True
72+
73+
# Do not include spaces around selected binary operators.
74+
# Example: 1 + 2 * 3 - 4 / 5 => 1 + 2*3 - 4/5
75+
no_spaces_around_selected_binary_operators = True
76+
77+
# Allow lambdas to be formatted on more than one line.
78+
allow_multiline_lambdas = True
79+
80+
SPLIT_PENALTY_FOR_ADDED_LINE_SPLIT = 10
81+
SPLIT_PENALTY_AFTER_OPENING_BRACKET = 500

tensorlayer/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
global_dict = {}
5757

5858
# Use the following formating: (major, minor, patch, prerelease)
59-
VERSION = (1, 8, 6, "rc2")
59+
VERSION = (1, 8, 6, "rc3")
6060
__shortversion__ = '.'.join(map(str, VERSION[:3]))
6161
__version__ = '.'.join(map(str, VERSION[:3])) + "".join(VERSION[3:])
6262

0 commit comments

Comments
 (0)