Skip to content

Commit 6697973

Browse files
andylou2tfx-copybara
authored andcommitted
noop
PiperOrigin-RevId: 311355499
1 parent 77f74ca commit 6697973

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ def has_ext_modules(self):
7878
'Intended Audience :: Education',
7979
'Intended Audience :: Science/Research',
8080
'License :: OSI Approved :: Apache Software License',
81+
'Operating System :: MacOS :: MacOS X',
8182
'Operating System :: POSIX :: Linux',
8283
'Programming Language :: Python',
8384
'Programming Language :: Python :: 3',

struct2tensor/struct2tensor.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ def s2t_dynamic_library(
9595
native.cc_library(
9696
name = name,
9797
srcs = srcs,
98+
alwayslink = 1,
9899
copts = DYNAMIC_COPTS,
99100
deps = true_deps + DYNAMIC_DEPS,
100101
)

struct2tensor/tools/docker_build/Dockerfile.manylinux2010

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
# Dockerfile for building a manylinux2010 struct2tensor wheel.
1616

1717
# This docker image is essentially pypa/manylinux2010 + bazel.
18-
FROM us.gcr.io/tfx-oss-testing/manylinux2010-bazel
18+
FROM us.gcr.io/tfx-oss-testing/manylinux2010-bazel-staging-py38
1919
WORKDIR /struct2tensor
2020
CMD ["struct2tensor/tools/docker_build/build_manylinux.sh"]

struct2tensor/tools/docker_build/build_manylinux.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,28 @@ WORKING_DIR=$PWD
2626

2727
function setup_environment() {
2828
set -x
29+
source scl_source enable rh-python36
2930
# Since someone may run this twice from the same directory,
3031
# it is important to delete the dist directory.
3132
rm -rf dist
3233
# TODO(martinz): move this directly to the docker image.
3334
# RUN yum -y install rsync
3435
# However, if we move this this, we get
3536
# ./bazel-bin/build_pip_package: line 55: rsync: command not found
36-
sudo yum -y install rsync
37+
yum -y install rsync
3738

3839
if [[ -z "${PYTHON_VERSION}" ]]; then
39-
echo "Must set PYTHON_VERSION env to 35|36|37|27"; exit 1;
40+
echo "Must set PYTHON_VERSION env to 35|36|37"; exit 1;
4041
fi
4142
# Bazel will use PYTHON_BIN_PATH to determine the right python library.
42-
if [[ "${PYTHON_VERSION}" == 27 ]]; then
43-
PYTHON_DIR=/opt/python/cp27-cp27mu
44-
elif [[ "${PYTHON_VERSION}" == 35 ]]; then
43+
if [[ "${PYTHON_VERSION}" == 35 ]]; then
4544
PYTHON_DIR=/opt/python/cp35-cp35m
4645
elif [[ "${PYTHON_VERSION}" == 36 ]]; then
4746
PYTHON_DIR=/opt/python/cp36-cp36m
4847
elif [[ "${PYTHON_VERSION}" == 37 ]]; then
4948
PYTHON_DIR=/opt/python/cp37-cp37m
5049
else
51-
echo "Must set PYTHON_VERSION env to 35|36|37|27"; exit 1;
50+
echo "Must set PYTHON_VERSION env to 35|36|37"; exit 1;
5251
fi
5352

5453
export PIP_BIN="${PYTHON_DIR}"/bin/pip || exit 1;

0 commit comments

Comments
 (0)