Skip to content

Commit dbba3ba

Browse files
author
Jonathan DEKHTIAR
authored
Tl.files refactored (#657)
Tl.files refactored
1 parent 8bdba2b commit dbba3ba

Some content is hidden

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

57 files changed

+1797
-144
lines changed

.pyup.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,25 @@ search: False
3131
# allowed: list
3232
requirements:
3333
# Requirements for the library
34-
- requirements.txt
34+
- requirements/requirements.txt
3535

3636
# Requirements for the development
37-
- requirements_dev.txt
37+
- requirements/requirements_tf_cpu.txt
3838

3939
# Requirements for the development
40-
- requirements_tf_cpu.txt
40+
- requirements/requirements_tf_gpu.txt
4141

4242
# Requirements for the development
43-
- requirements_tf_gpu.txt
44-
45-
# Requirements for running unittests
46-
- tests/requirements.txt
43+
- requirements/requirements_dev.txt
4744

4845
# Requirements for building docs
49-
- docs/requirements.txt
46+
- requirements/requirements_doc.txt
47+
48+
# Not necessary, but recommended libraries
49+
- requirements/requirements_extra.txt
50+
51+
# Requirements for running unittests
52+
- requirements/requirements_test.txt
5053

5154
# add a label to pull requests, default is not set
5255
# requires private repo permissions, even on public repos

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# https://docs.travis-ci.com/user/languages/python/
22
language: python
33

4+
addons:
5+
apt:
6+
update: false
7+
48
branches:
59
only:
610
- master
@@ -42,7 +46,7 @@ env:
4246

4347
install:
4448
- pip install tensorflow==$_TF_VERSION
45-
- pip install -e .[db,dev,test,doc]
49+
- pip install -e .[db,dev,doc,extra,test]
4650

4751
script:
4852
# units test

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ To release a new version, please update the changelog as followed:
103103
- TF Version older than 1.6.0 are officially unsupported and raises an exception (by @DEKHTIARJonathan in #644)
104104
- Readme Badges Updated with Support Python and Tensorflow Versions (by @DEKHTIARJonathan in #644)
105105
- TL logging API has been consistent with TF logging API and thread-safe (by @DEKHTIARJonathan in #645)
106+
- Relative Imports changed for absolute imports (by @DEKHTIARJonathan in #657)
107+
- `tl.files` refactored into a directory with numerous files (by @DEKHTIARJonathan in #657)
108+
- `tl.files.voc_dataset` fixed because of original Pascal VOC website was down (by @DEKHTIARJonathan in #657)
109+
- extra requirements hidden inside the library added in the project requirements (by @DEKHTIARJonathan in #657)
110+
- requirements files refactored in `requirements/` directory (by @DEKHTIARJonathan in #657)
106111

107112
### Deprecated
108113

docker/python2/cpu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN if [ -z "$TL_VERSION" ]; then \
1212
&& cd /tensorlayer_dist/ \
1313
&& git clone https://github.com/tensorlayer/tensorlayer.git \
1414
&& cd tensorlayer \
15-
&& pip install -e .[db,dev,test,doc] \
15+
&& pip install -e .[db,dev,doc,extra,test] \
1616
&& rm -rf /var/lib/apt/lists/* ; \
1717
else \
1818
echo "Building Tag Release:" "$TL_VERSION" \

docker/python2/gpu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ RUN if [ -z "$TL_VERSION" ]; then \
1212
&& cd /tensorlayer_dist/ \
1313
&& git clone https://github.com/tensorlayer/tensorlayer.git \
1414
&& cd tensorlayer \
15-
&& pip install -e .[db,dev,test,doc] \
15+
&& pip install -e .[db,dev,doc,extra,test] \
1616
&& rm -rf /var/lib/apt/lists/* ; \
1717
else \
1818
echo "Building Tag Release:" "$TL_VERSION" \
1919
&& pip install tensorlayer=="$TL_VERSION" ; \
20-
fi
20+
fi

docker/python3/cpu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN if [ -z "$TL_VERSION" ]; then \
1212
&& cd /tensorlayer_dist/ \
1313
&& git clone https://github.com/tensorlayer/tensorlayer.git \
1414
&& cd tensorlayer \
15-
&& pip install -e .[db,dev,test,doc] \
15+
&& pip install -e .[db,dev,doc,extra,test] \
1616
&& rm -rf /var/lib/apt/lists/* ; \
1717
else \
1818
echo "Building Tag Release:" "$TL_VERSION" \

docker/python3/gpu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN if [ -z "$TL_VERSION" ]; then \
1212
&& cd /tensorlayer_dist/ \
1313
&& git clone https://github.com/tensorlayer/tensorlayer.git \
1414
&& cd tensorlayer \
15-
&& pip install -e .[db,dev,test,doc] \
15+
&& pip install -e .[db,dev,doc,extra,test] \
1616
&& rm -rf /var/lib/apt/lists/* ; \
1717
else \
1818
echo "Building Tag Release:" "$TL_VERSION" \
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
imageio>=2.3,<2.4
2+
lxml>=4.2,<4.3
13
matplotlib>=2.2,<2.3
24
numpy>=1.14,<1.15
35
progressbar2>=3.38,<3.39
46
scikit-image>=0.14,<0.15
57
scipy>=1.1,<1.2
6-
imageio>=2.3,<2.4
8+
tqdm>=4.23,<4.24
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)