File tree 9 files changed +33
-27
lines changed
PyCharm.idea/inspectionProfiles
9 files changed +33
-27
lines changed Original file line number Diff line number Diff line change 17
17
- uses : actions/checkout@v4
18
18
- uses : actions/setup-python@v5
19
19
with :
20
- python-version : 3.7
20
+ python-version : 3.8
21
21
cache : ' pip'
22
22
cache-dependency-path : ' .github/workflows/black.yml'
23
23
- run : pip install black==22.3.0
Original file line number Diff line number Diff line change 92
92
fail-fast : false
93
93
matrix :
94
94
python-version :
95
- - 3.7
95
+ - 3.8
96
96
action :
97
97
- TEST=Dataset
98
98
- TEST=fork_exec
@@ -158,7 +158,7 @@ jobs:
158
158
fail-fast : false
159
159
matrix :
160
160
python-version :
161
- - 3.7
161
+ - 3.8
162
162
tf-version :
163
163
- 2.10.0
164
164
action :
@@ -174,23 +174,11 @@ jobs:
174
174
- TEST=TFUtil
175
175
- TEST=tools
176
176
include :
177
- - action : TEST=TFUtil
178
- python-version : 3.7
179
- tf-version : 1.15.3
180
177
- action : TEST=TFEngine
181
- python-version : 3.7
182
- tf-version : 1.15.3
183
- - action : TEST=TFEngine
184
- python-version : 3.7
178
+ python-version : 3.8
185
179
tf-version : 2.3.0
186
- - action : TEST=TFNativeOp
187
- python-version : 3.7
188
- tf-version : 1.14.0
189
- - action : TEST=TFNetworkSigProcLayer
190
- python-version : 3.7
191
- tf-version : 1.15.3
192
180
- action : TEST=demos RETURNN_DISABLE_TORCH=1
193
- python-version : 3.7
181
+ python-version : 3.8
194
182
tf-version : 2.3.0
195
183
196
184
steps :
@@ -221,7 +209,7 @@ jobs:
221
209
222
210
pip install --user pytest
223
211
224
- if [[ "${{matrix.tf-version}}" == 2.[0123].* || "${{matrix.tf-version}}" == 1.* ]]; then
212
+ if [[ "${{matrix.tf-version}}" == 2.[0123].* ]]; then
225
213
# Older TF needs older NumPy version.
226
214
# https://github.com/rwth-i6/returnn/pull/1160#issuecomment-1284537803
227
215
pip install --user numpy==1.19.5
@@ -358,7 +346,7 @@ jobs:
358
346
include :
359
347
# Some selected tests (but not all) with some other versions.
360
348
- action : TEST=rf_base
361
- python-version : 3.7
349
+ python-version : 3.8
362
350
torch-version : 1.13.1
363
351
tf-version : 2.10.0
364
352
Original file line number Diff line number Diff line change 26
26
27
27
- uses : actions/setup-python@v5
28
28
with :
29
- python-version : 3.7
29
+ python-version : 3.8
30
30
31
31
- name : Install Python deps
32
32
run : |
Original file line number Diff line number Diff line change @@ -6,6 +6,10 @@ or any changes which could potentially break or change the behavior of existing
6
6
This is intentionally kept short. For a full change log, just see the Git log.
7
7
8
8
9
+ ## 2024-12-13: Bump min Python version from 3.7 to 3.8 ([ issue #1326 ] ( https://github.com/rwth-i6/returnn/issues/1326 ) )
10
+
11
+ This also drops support for TF 1.x.
12
+
9
13
## 2024-06-07: ` VariableDataset `
10
14
11
15
Custom subdataset per subepoch based on user-provided function.
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ General rules when contributing to the code of RETURNN:
29
29
and in general to use newer TF features (even maybe TF >=2),
30
30
as long as your new feature (new layer or so) is just optional.
31
31
For older TF support, ` TFCompat.py ` might be helpful. (See code for examples.)
32
- * We support Python >=3.7 ([ discussion] ( https://github.com/rwth-i6/returnn/issues/487 ) ).
32
+ * We support Python >=3.8 ([ discussion] ( https://github.com/rwth-i6/returnn/issues/1326 ) ).
33
33
34
34
About new features:
35
35
Original file line number Diff line number Diff line change @@ -72,3 +72,15 @@ Questions can also be asked on
72
72
73
73
.. image :: https://github.com/rwth-i6/returnn/workflows/CI/badge.svg
74
74
:target: https://github.com/rwth-i6/returnn/actions
75
+
76
+ Dependencies
77
+ ============
78
+
79
+ pip dependencies are listed in ``requirements.txt `` and ``requirements-dev ``,
80
+ although some parts of the code may require additional dependencies (e.g. ``librosa ``, ``resampy ``) on-demand.
81
+
82
+ RETURNN supports Python >= 3.8. Bumps to the minimum Python version are listed in `CHANGELOG.md <https://github.com/rwth-i6/returnn/blob/master/CHANGELOG.md >`__.
83
+
84
+ TensorFlow-based setups require TensorFlow >= 2.2.
85
+
86
+ PyTorch-based setups require Torch >= 1.0.
Original file line number Diff line number Diff line change 1
1
[tool .black ]
2
2
line-length = 120
3
- target-version = [" py37 " ] # https://github.com/rwth-i6/returnn/issues/487
3
+ target-version = [" py38 " ] # https://github.com/rwth-i6/returnn/issues/1326
4
4
extend-exclude = '''
5
5
/(
6
6
# All Git submodules, see .gitmodules.
Original file line number Diff line number Diff line change 4
4
<inspection_tool class =" PyCompatibilityInspection" enabled =" true" level =" WARNING" enabled_by_default =" true" >
5
5
<option name =" ourVersions" >
6
6
<value >
7
- <list size =" 3" >
8
- <item index =" 0" class =" java.lang.String" itemvalue =" 3.7" />
9
- <item index =" 1" class =" java.lang.String" itemvalue =" 3.8" />
10
- <item index =" 2" class =" java.lang.String" itemvalue =" 3.9" />
7
+ <list size =" 2" >
8
+ <item index =" 0" class =" java.lang.String" itemvalue =" 3.8" />
9
+ <item index =" 1" class =" java.lang.String" itemvalue =" 3.9" />
11
10
</list >
12
11
</value >
13
12
</option >
Original file line number Diff line number Diff line change @@ -52,9 +52,12 @@ def filter_out(ls):
52
52
i = 0
53
53
while i < len (ls ):
54
54
s = ls [i ]
55
- if " tensorflow/core/ " in s or "tensorflow/stream_executor/" in s : # some TF warnings
55
+ if any ( f" { l } tensorflow/" in s for l in "IWE" ) : # some TF warnings
56
56
i += 1
57
57
continue
58
+ elif "SyntaxWarning" in s :
59
+ i += 2
60
+ continue
58
61
# RuntimeWarning|FutureWarning are warnings and they include the code-line in the next output line
59
62
if i + 1 < len (ls ) and ls [i + 1 ].startswith (" " ):
60
63
if re .match (".*:\\ d+: RuntimeWarning: numpy.*" , s ) or re .match (".*:\\ d+: FutureWarning: .*" , s ):
You can’t perform that action at this time.
0 commit comments