Skip to content

Commit

Permalink
Release preparation and add python 3.8
Browse files Browse the repository at this point in the history
The PR has the following changes:
1. remove "exclude python 3.5" which causes travis to skip all jobs
2. add jobs for python 3.8
3. update onnx commit id
4. change ONNX_NAMESPACE to ONNX_REL_1_7
  • Loading branch information
chinhuang007 committed Apr 6, 2020
1 parent 5ca517d commit 844edf8
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 11 deletions.
34 changes: 26 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
env:
global:
- REPO_DIR=onnx
- BUILD_COMMIT=553df22c67bee5f0fe6599cff60f1afc6748c635
- BUILD_COMMIT=d3c3b0dfc528082f30a79811d299f4387f09460d
- PLAT=x86_64
- PB_VERSION=2.6.1
- UNICODE_WIDTH=32
- REPO=https://upload.pypi.org/legacy/
- TEST_REPO=https://test.pypi.org/legacy/
- secure: QoYek8syaGZ0WxUCJqZvRvmSWsPVg7tlON8yPcgc4VgqSgAb2bNt4Na5WPiub6PFs/sIc9vEvMty3tcjMfkW4aUtalSnLJAx1S+EArhhY8KRkCxWmNPv8PQi6f769tgbQHCTFFOa+b7Y6jY6Z7jAQ2AJ+Yu6eblq7edU/yV1coP6Gd9zrBwUsDrGgy366O819DeVseozohw62sIQmkk901b8T5Jwtel9Xsu/wdmAlI6d/mTP1//wgFhaENGUhZle9K+0Y/mNlvmDn6axWl5q2WqTbt/nhEWNJHz/Fr13YND/eO8Xt3JBR8vs04+4c1+dqy/nS27IoEmdSxi06GuKqc82muSVODUhpQ0P4z/4EqtCvlHWEi7VtEfQBB0aAePvQz0lAVAhfZE9376XtQnXbaRWZUDg05YFuUHaYhHlRe5N3fDyYzyJyUWsJgkvqhTumrENPRuWBWYZSXnP98XHVTHkmYG+aMUjmzpLuGIkcS4SKDV594ikyN6ERkDMsclc/nZBJLyhivi+okrq3LtAHpY1bBALXcvmZsfMdGrDv904X1ifC/CQpha5N0Xj+2mYv76K3MnEj8WdWYPBwp5gNiKH59bRcDFiMkaNwwXGvGVcDsIg0uEaO29pcRfZeZYemAzS/3Lht7zzzNxL6sM//2+ufRaIlyx0xzjc9uTxtZA=
- secure: U2EmHLHZoyi6xuX3SthN4U9N7akwPzEkAv4F4TAoh+PZfQzJqverQ/yjlEMz5U/YbD5d2dQ0GjAZEcwoRTb1RfhYYRAT1aAGxezIcNUcBe70tPbO5u86a2GBL7mFDYcUWUAjxUiQ2vcGz/YO2juXmxxGXPLUBQ1qatnJbull333bi4N1fipsK6fV3SUphIZhi81pzHJZ8gDJln1vWAVZg669NhUu3HWmV4Q9TQDUo0oJj6WGTZAFnPoeVaXGex3xJ/cCOcz9N6beUpXBWeCCmwTrXc68h/DX28hKkLyRIfVbCRCvaDXrFkOis5boZJqfMYFMNqsyKwATWYnU7JVBwSgFWsLI9ItLCX+GrYOzM8odMOi3qtWbtgryghPNZtg8lKB2b6sK3f0/Awr/ccrSQ/D9i8ZrQF9xei+XdiJE7gtBvYFFfg4pOvvQHYMM0A5SIbc1dm8E4PGwZI/YTpTBeE3jgW4igZ/uTtYMcVLb14V/D/yHdqAE9Edzok1GsTSocnjdMXMSMYZEwY9/PiD9EPbtzfxTL8Mrgw7jfU7PxPHY1pzR/lXqZ4wuwHL7/+aGjQW2PCaIKXKMwJpGWibmCyZ4vcPdWCmNt/F9fxmWfxXLbvJSlOKTnqK7PKoqX3G4dfgrOZF5DqDTL8blfulX0IYoSze8v8L2qebF+nBfCUI=
- secure: o4fRXzWwcFKdjLRjJqRR0bw1uNyhNpruCAalXSuDfHrViM4BXJnoXouQqT8qJzZ+PzTa6AEd60IZCM3GxcL5MtXeQp84IbHEVllnOQ8UmbyHGHO0PLElhzNlQER2NiksIHjm6iZszl16tbiqUwGfvu8qa2D5hvYYPEuac8d3mvhRtPqLaiPEH3xGYd6Ld0F3jSHToY1yayCnt3OP5EgnRZviU5bXP96CpJW/cfSZA5F4+nJJutUNitElt9k62xbkT/lAs25Staul8+IjGjW1bNQv7G1iuZDnBbS81nuqIY4q1sdINTvoGEa5WlOHwSZA7qxAQhZ5064dxNIa5EJdWEvPSIuwMh/+8D22wrO2CWDEkhfxk1MTmeAFoYoYz+GM1gvtvbhQqqeDfaDG1Q7ksOTZWQ18THVYt2rymtrbwER6Gc6XtXHwL47PFc9eWTN21CrIkpqkDdTwDDywi+DiOPI179DfZUe79JjtENM2OIpXt4oJcY+YdHcd4ola2OO8tFsMt7Rd2ow7zf7DQXQrWKX7op+cg+mPvI+NQx08tvvmdURfWNB3irA0udfuVbDY6pTrTiitPoEuYFK9mTJPjOEu/5i3UGtUtOd4H+T2LKmKpl8HcNp7cQOrkO3UaKCZCVIh3JXl8DQXu+iHMuiA/BxvY1o1CKL0chGRH46/0SI=
- secure: KGus+LHT8lw8qZY7T1RdC0dqgW6r8vTbcNbcRn/K902/BDylo58AGzCwcubRokmCz3JyjreKSowrkmAD2Ta8b4wSFndoQ4rxDBe6Me7CY0PI6Lsa5+qzy/oQAmf0hmtw+ffX2lW2BOsYSOTytK4p+wc9xf5NWc31aezbUnXX6VeGDnotBErkAiZ3SsC1zlPngMulYQmtSQhuiv1D31BE3ynq9HOSJmQxzgDrNW2MnpQL5mCk6dABW2dig1OVaxamvwRjVCSAGj94VXsIbTp90+4ssuOXHOD28Jr/evUy9e8kUpulvtldavS9KThclw3JA45jdvcpYrQ9+ft/+SviKxHki93dUuk3fLvHpnYA1+022U6gkLiyp5aTyAqb5fOvwEmXoexhv6wAT4a28ToOwKqSym0dKbBq9k8mBi2kesuEcJqVylAexBgHgb2P40vzzORBLmfMLGwcD+dAK0ni+yWcrfmNh/XZwWwYGHQPoSC142A++dkPyAPHNZuDUEaTbP+GoyroJWQ+Yx6iupMKLhKwChsHfqRYx3cuDq+0CjZXBAz7D0hVuGX0k8mfrNYXMDEv4tKHe4YE6BYfdsi2ff3GQCZnQbYOPw40icSSgr43FnV7C5/HD0q4RRKNi6jwpbzT+iuBX9jPXXWoqtmSfpVrcU8IR0MeTlbw5huM3lY=
- secure: UIp/Wj6C6hJ5XFwMNWAWHK8Lhm4B+9K81dSZIyc16/doCh1xVgMEvTY+AslKnQuJOyt3ZaOqqney2x8q+228aextHV8BsYnCNSvD4Nhfi1slve8hOzy0ZFmH7QFtn0iblAfkDQpnPu3IjBuNA7b/u0ERyduFDQ2I9/CfQAmAk8OSYBHVgSEGAngNTOWwvZZXv3NBa+aZojqoeFqxyPz0obHX/8BF2xhv/IDwXSOLdDKvj9jG/1JfdNUiPG5drAUqUXgbxQRxooshaNzSCVRSAYlfd1PH0ohPlvQWkS+TE1nLMJKROeBT3VCYWjnY5cxlz8lOCTUChkXSZqjhs2eWDp2I8E4/cCJSAsMfZylCIqzGlGRgRS3ml/htQbYlBks0GRCniWV6okCio9Q6l0rDZVkrNgqjUa23LReAVHXoQu3mrqY/gAXmSH4ZlMQGk3en8WT/KjEVKnKuW7s3HGSYzzZoNX1mV3qG6GZu/JWGJM2C1HEiFtAHhHG4CeLRU1oFU+iyck3Xlvt2vZ15UlsU7VmQSga4ZIIwO44/38JoYEy8Bp3nACYXjJkZmoTNyf/TCEol/g44px0YPH7v06MOh/+E8xOTNzfoh3MwLs4iy2/RYjth6/iAZYM/0mwhA2xI0QOtIT0BdG+140xQRM0Ra3dT7WiQEOnLK893tbC9cKI=
- secure: rUg3xDnmWlp2CCAjuJIcbxYYp6RH+pNHWx0Vv4MMzy+sVLBIqULbsfrBr2PZgWTYQBhYymGYxg31I+kCSGT7ZK2VmKoUYHD9eBR+5NrCfzBGO00V0AGyE+1ZFcN+7gwreo24eyJM0600s0V0/RLKLIyZXJ8HSysOQqpGcBAZB2LkOqar4PTBuqlalWpCwG0YJyWl2hqnGgvTBWo/vyesOwA2OuWBg+k/2rzZWtV+qcwBPezJLplIg0iSVuML2iG4OjER18tDoX6MDPgmb7rrdcy6X4xCRjz6zEiv7SCr5oiQCGjaLeNuEFQB5JtMswjpiaxp9CVYFue0npvc/Q1vf8XPBdLfeQMh7ORhiD1RPbdeAhF91p7glOU3VqSnCoMoK/VddWDJ0p8cu+AcvGeVvDnXRVg+l3vhtylen/g4uQqETQyRzk6QVwfFXWQBT/8j0ERh9ooI7glPkWvgJuh0Cd8k96ZoSSs/Q6NwrPrq3lA2KmlU3Rl6o2SXJ61ysoTtWcSjJQ2AzDSkMJHfeOl7CJc2eHuss7aOkITPlvrQr4G/Gb8H9J+U23cRqGbypPiJUjkwzQuTVCrA466OSC4TB6O9I0gMjO9uOFmKoRwk6pCkKhS986KzZ25zLhmmvzQII0tBDZCyuco1vIGH2Cwyp74BNK3DvA/G1odkh2tgAUg=

language: python
# Default Python version is usually 2.7
Expand All @@ -21,9 +23,6 @@ services: docker
# So we have the line below for OSX builds
# osx_image: xcode9.3beta
matrix:
# Exclude the default Python 3.5 build
exclude:
- python: 3.5
include:
- os: osx
language: generic
Expand All @@ -49,6 +48,14 @@ matrix:
- MB_PYTHON_VERSION=3.7
- ONNX_ML=1
- MACOSX_DEPLOYMENT_TARGET=10.9
- os: osx
language: generic
sudo: required
osx_image: xcode9.3beta
env:
- MB_PYTHON_VERSION=3.8
- ONNX_ML=1
- MACOSX_DEPLOYMENT_TARGET=10.9
- os: osx
language: generic
sudo: required
Expand Down Expand Up @@ -95,7 +102,12 @@ matrix:
sudo: required
env:
- MB_PYTHON_VERSION=3.7
- ONNX_ML=1
- ONNX_ML=1
- os: linux
sudo: required
env:
- MB_PYTHON_VERSION=3.8
- ONNX_ML=1
- os: linux
sudo: required
env:
Expand All @@ -114,6 +126,12 @@ matrix:
- MB_PYTHON_VERSION=3.7
- ONNX_ML=1
- PLAT=i686
- os: linux
sudo: required
env:
- MB_PYTHON_VERSION=3.8
- ONNX_ML=1
- PLAT=i686

before_install:
- source multibuild/common_utils.sh;
Expand All @@ -138,7 +156,7 @@ after_success:
echo "Not deploying as not a tagged commit.";
fi
- >
if [ "$TRAVIS_BRANCH" == "pypi_test" ]; then
if [ "$TRAVIS_BRANCH" == "rel-test" ]; then
pip install twine;
pip install pyOpenSSL ndg-httpsclient pyasn1 || true;
ls ${TRAVIS_BUILD_DIR}/wheelhouse/;
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ environment:

install:
- cmd: set repo_dir=onnx
- cmd: set build_commit=553df22c67bee5f0fe6599cff60f1afc6748c635
- cmd: set build_commit=3193b023cff0c984816ea007b3fe2046e2fa9fef
- cmd: git submodule update --init --recursive
- cmd: cd %repo_dir%
- cmd: git fetch origin
Expand Down
2 changes: 1 addition & 1 deletion config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
function build_wheel {
build_libs
export ONNX_ML=1
time ONNX_NAMESPACE=ONNX_REL_1_6 build_bdist_wheel $@
time ONNX_NAMESPACE=ONNX_REL_1_7 build_bdist_wheel $@
}

function build_libs {
Expand Down
2 changes: 1 addition & 1 deletion onnx
Submodule onnx updated 4021 files

0 comments on commit 844edf8

Please sign in to comment.