Skip to content

Commit 4da7742

Browse files
committed
Merge branch 'master' of https://github.com/tensorflow/io into avro-updates
2 parents e53644a + b00c128 commit 4da7742

File tree

4 files changed

+31
-30
lines changed

4 files changed

+31
-30
lines changed

.github/workflows/build.yml

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ jobs:
252252
runs-on: ubuntu-latest
253253
strategy:
254254
matrix:
255-
python: ['3.6', '3.7', '3.8']
255+
python: ['3.6', '3.7', '3.8', '3.9']
256256
steps:
257257
- uses: actions/checkout@v2
258258
- uses: actions/download-artifact@v1
@@ -281,16 +281,10 @@ jobs:
281281
linux-test:
282282
name: Test ${{ matrix.python }} Linux
283283
needs: linux-wheel
284-
runs-on: ${{ matrix.os }}
284+
runs-on: ubuntu-20.04
285285
strategy:
286286
matrix:
287-
os: [ubuntu-18.04, ubuntu-20.04]
288-
python: ['3.7', '3.8']
289-
exclude:
290-
- os: ubuntu-18.04
291-
python: '3.8'
292-
- os: ubuntu-20.04
293-
python: '3.7'
287+
python: ['3.7', '3.8', '3.9']
294288
steps:
295289
- uses: actions/checkout@v2
296290
- uses: actions/download-artifact@v1
@@ -317,7 +311,7 @@ jobs:
317311
set -x -e
318312
df -h
319313
docker run -i --rm -v $PWD:/v -w /v --net=host \
320-
buildpack-deps:$(echo ${{ matrix.os }} | awk -F- '{print $2}') \
314+
buildpack-deps:20.04 \
321315
bash -x -e .github/workflows/build.wheel.sh python${{ matrix.python }}
322316
323317
windows-bazel:
@@ -370,7 +364,7 @@ jobs:
370364
runs-on: windows-latest
371365
strategy:
372366
matrix:
373-
python: ['3.6', '3.7', '3.8']
367+
python: ['3.6', '3.7', '3.8', '3.9']
374368
steps:
375369
- uses: actions/checkout@v2
376370
- uses: actions/download-artifact@v1
@@ -399,7 +393,7 @@ jobs:
399393
runs-on: windows-latest
400394
strategy:
401395
matrix:
402-
python: ['3.7', '3.8']
396+
python: ['3.7', '3.8', '3.9']
403397
steps:
404398
- uses: actions/checkout@v2
405399
- uses: actions/download-artifact@v1
@@ -469,6 +463,10 @@ jobs:
469463
with:
470464
name: Linux-3.8-wheel
471465
path: Linux-3.8-wheel
466+
- uses: actions/download-artifact@v1
467+
with:
468+
name: Linux-3.9-wheel
469+
path: Linux-3.9-wheel
472470
- uses: actions/download-artifact@v1
473471
with:
474472
name: Windows-3.6-wheel
@@ -481,6 +479,10 @@ jobs:
481479
with:
482480
name: Windows-3.8-wheel
483481
path: Windows-3.8-wheel
482+
- uses: actions/download-artifact@v1
483+
with:
484+
name: Windows-3.9-wheel
485+
path: Windows-3.9-wheel
484486
- run: |
485487
set -e -x
486488
mkdir -p wheelhouse
@@ -490,9 +492,11 @@ jobs:
490492
cp Linux-3.6-wheel/*.whl wheelhouse/
491493
cp Linux-3.7-wheel/*.whl wheelhouse/
492494
cp Linux-3.8-wheel/*.whl wheelhouse/
495+
cp Linux-3.9-wheel/*.whl wheelhouse/
493496
cp Windows-3.6-wheel/*.whl wheelhouse/
494497
cp Windows-3.7-wheel/*.whl wheelhouse/
495498
cp Windows-3.8-wheel/*.whl wheelhouse/
499+
cp Windows-3.9-wheel/*.whl wheelhouse/
496500
ls -la wheelhouse/
497501
sha256sum wheelhouse/*.whl
498502
- uses: actions/upload-artifact@v1
@@ -585,11 +589,10 @@ jobs:
585589
name: Nightly ${{ matrix.python }} Linux
586590
if: github.event_name == 'push'
587591
needs: [build-number, release]
588-
runs-on: ${{ matrix.os }}
592+
runs-on: ubuntu-20.04
589593
strategy:
590594
matrix:
591-
os: [ubuntu-18.04]
592-
python: ['3.6', '3.7', '3.8']
595+
python: ['3.6', '3.7', '3.8', '3.9']
593596
steps:
594597
- uses: actions/download-artifact@v1
595598
with:
@@ -627,7 +630,7 @@ jobs:
627630
runs-on: windows-latest
628631
strategy:
629632
matrix:
630-
python: ['3.6', '3.7', 3.8]
633+
python: ['3.6', '3.7', '3.8', '3.9']
631634
steps:
632635
- uses: actions/download-artifact@v1
633636
with:
@@ -685,6 +688,10 @@ jobs:
685688
with:
686689
name: Linux-3.8-nightly
687690
path: Linux-3.8-nightly
691+
- uses: actions/download-artifact@v1
692+
with:
693+
name: Linux-3.9-nightly
694+
path: Linux-3.9-nightly
688695
- uses: actions/download-artifact@v1
689696
with:
690697
name: Windows-3.6-nightly
@@ -697,6 +704,10 @@ jobs:
697704
with:
698705
name: Windows-3.8-nightly
699706
path: Windows-3.8-nightly
707+
- uses: actions/download-artifact@v1
708+
with:
709+
name: Windows-3.9-nightly
710+
path: Windows-3.9-nightly
700711
- run: |
701712
set -e -x
702713
mkdir -p dist
@@ -706,9 +717,11 @@ jobs:
706717
cp Linux-3.6-nightly/*.whl dist/
707718
cp Linux-3.7-nightly/*.whl dist/
708719
cp Linux-3.8-nightly/*.whl dist/
720+
cp Linux-3.9-nightly/*.whl dist/
709721
cp Windows-3.6-nightly/*.whl dist/
710722
cp Windows-3.7-nightly/*.whl dist/
711723
cp Windows-3.8-nightly/*.whl dist/
724+
cp Windows-3.9-nightly/*.whl dist/
712725
ls -la dist/
713726
sha256sum dist/*.whl
714727
- uses: pypa/gh-action-pypi-publish@master

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def has_ext_modules(self):
134134
],
135135
keywords="tensorflow io machine learning",
136136
packages=setuptools.find_packages(where=".", exclude=["tests"]),
137-
python_requires=">=3.5, <3.9",
137+
python_requires=">=3.5, <3.10",
138138
install_requires=[package],
139139
package_data={".": ["*.so"],},
140140
project_urls={

tensorflow_io/core/plugins/file_system_plugins.cc

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,12 @@ void TF_InitPlugin(TF_FilesystemPluginInfo* info) {
3131
tensorflow::io::az::ProvideFilesystemSupportFor(&info->ops[0], "az");
3232
tensorflow::io::http::ProvideFilesystemSupportFor(&info->ops[1], "http");
3333
if (enable_legacy == "true" || enable_legacy == "1") {
34-
// TODO: enable on windows once tf-nightly releases windows build
35-
// that contains TF_ENABLE_LEGACY_FILESYSTEM.
36-
#if defined(_MSC_VER)
37-
tensorflow::io::s3::ProvideFilesystemSupportFor(&info->ops[2], "s3");
38-
#else
3934
tensorflow::io::s3::ProvideFilesystemSupportFor(&info->ops[2], "s3e");
40-
#endif
4135
tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[3], "hdfse");
4236
tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[4], "viewfse");
4337
tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[5], "hare");
4438
} else {
45-
// TODO: enable on windows once tf-nightly releases windows build
46-
// that contains TF_ENABLE_LEGACY_FILESYSTEM.
47-
#if defined(_MSC_VER)
48-
tensorflow::io::s3::ProvideFilesystemSupportFor(&info->ops[2], "s3e");
49-
#else
5039
tensorflow::io::s3::ProvideFilesystemSupportFor(&info->ops[2], "s3");
51-
#endif
5240
tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[3], "hdfs");
5341
tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[4], "viewfs");
5442
tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[5], "har");

tests/test_hdfs/hdfs_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set -o pipefail
1919

2020
HADOOP_VERSION=2.7.0
2121
docker pull sequenceiq/hadoop-docker:$HADOOP_VERSION
22-
docker run -d --rm --net=host --name=tensorflow-io-hdfs sequenceiq/hadoop-docker:$HADOOP_VERSION
22+
docker run -d --rm -p 9000:9000 --name=tensorflow-io-hdfs sequenceiq/hadoop-docker:$HADOOP_VERSION
2323
echo "Waiting for 30 secs until hadoop is up and running"
2424
sleep 30
2525
docker logs tensorflow-io-hdfs

0 commit comments

Comments
 (0)