Skip to content

Commit f3fa91e

Browse files
committed
changes
1 parent 6f4c5b3 commit f3fa91e

File tree

4 files changed

+13
-65
lines changed

4 files changed

+13
-65
lines changed

.github/workflows/keras_unit_test_ci.yml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -86,30 +86,6 @@ jobs:
8686
name: Test Results (Py311-TF2.19-ubuntu)
8787
path: ./**/test-results-*.xml
8888

89-
Test2_py37_with_tf1_15: # Do not change this name because it is used in Ruleset of this repo.
90-
strategy:
91-
fail-fast: false
92-
runs-on: ubuntu-22.04
93-
94-
steps:
95-
- name: Checkout code
96-
uses: actions/checkout@v4
97-
98-
- name: Run Tests (Py37-TF1.15)
99-
uses: ./.github/actions/keras_unit_test
100-
with:
101-
tf_version: '1.15.5'
102-
python_version: '3.7'
103-
ort_version: '1.14.1'
104-
onnx_version: '1.14.1'
105-
106-
- name: Upload Test Results
107-
if: always()
108-
uses: actions/upload-artifact@v4
109-
with:
110-
name: Test Results (Py37-TF1.15-ubuntu)
111-
path: ./**/test-results-*.xml
112-
11389
Extra_tests2:
11490
strategy:
11591
fail-fast: false
@@ -163,7 +139,7 @@ jobs:
163139

164140
publish-test-results:
165141
name: "Publish Tests Results to Github"
166-
needs: [Test2_py38_tf2_9, Test2_py310_tf2_19, Test2_py311_tf2_19, Test2_py37_with_tf1_15, Extra_tests2]
142+
needs: [Test2_py38_tf2_9, Test2_py310_tf2_19, Test2_py311_tf2_19, Extra_tests2]
167143
runs-on: ubuntu-latest
168144
permissions:
169145
checks: write

.github/workflows/pretrained_model_test_ci.yml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -69,32 +69,6 @@ jobs:
6969
name: Test Results (Py310-TF2.19-18-ubuntu)
7070
path: ./**/test-results-*.xml
7171

72-
Test3_py37_with_tf1_15: # Do not change this name because it is used in 'publish-test-results' section below.
73-
strategy:
74-
fail-fast: false
75-
runs-on: ubuntu-22.04
76-
77-
steps:
78-
- name: Checkout code
79-
uses: actions/checkout@v4
80-
81-
- name: Run Tests (Py310-TF2.15-18)
82-
uses: ./.github/actions/pretrained_model_test
83-
with:
84-
tf_version: '1.15.5'
85-
python_version: '3.7'
86-
os: 'ubuntu-22.04' # Max ubuntu version supports python 3.7.
87-
opset_version: '15'
88-
ort_version: '1.14.1'
89-
onnx_version: '1.14.1'
90-
91-
- name: Upload Test Results
92-
if: always()
93-
uses: actions/upload-artifact@v4
94-
with:
95-
name: Test Results (Py37-TF1.15-15-ubuntu)
96-
path: ./**/test-results-*.xml
97-
9872
Extra_tests3: # Do not change this name because it is used in 'publish-test-results' section below.
9973
strategy:
10074
fail-fast: false
@@ -153,7 +127,7 @@ jobs:
153127

154128
publish-test-results:
155129
name: "Publish Tests Results to Github"
156-
needs: [Test3_py38_tf2_9, Test3_py310_tf2_19, Test3_py37_with_tf1_15, Extra_tests3]
130+
needs: [Test3_py38_tf2_9, Test3_py310_tf2_19, Extra_tests3]
157131
runs-on: ubuntu-latest
158132
permissions:
159133
checks: write

.github/workflows/unit_test_ci.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,16 @@ jobs:
113113
python_version: '3.9'
114114
ort_version: '1.16.3'
115115
onnx_version: '1.16.1'
116-
- name: 'py37-tf1.15'
117-
tf_version: '1.15.5'
118-
python_version: '3.7'
119-
os: 'ubuntu-22.04' # Max ubuntu version supports python 3.7.
120-
opset_version: '15'
121-
ort_version: '1.14.1'
122-
onnx_version: '1.14.1'
123-
skip_tflite: 'True'
116+
- name: 'py310-tf2.19'
117+
tf_version: '2.19.0'
118+
python_version: '3.10'
119+
ort_version: '1.20.1'
120+
onnx_version: '1.17.0'
121+
- name: 'py311-tf2.19'
122+
tf_version: '2.19.0'
123+
python_version: '3.11'
124+
ort_version: '1.20.1'
125+
onnx_version: '1.17.0'
124126

125127
runs-on: ${{ matrix.os }}
126128

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,7 @@ You can install tf2onnx on top of tf-1.x or tf-2.x.
4646

4747
### Python
4848

49-
<<<<<<< HEAD
50-
We support Python ```3.7-3.11```.
51-
=======
52-
We support Python ```3.7-3.12```.
53-
>>>>>>> c34ac1d751427cf5d98023a21cce4c82b0cf96a1
49+
We support Python ```3.8-3.12```.
5450

5551
## Prerequisites
5652

0 commit comments

Comments
 (0)