Skip to content

Commit

Permalink
fix build dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
mortendahl committed Aug 29, 2019
1 parent 76caaa6 commit 4bcd9f1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
8 changes: 3 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ commands:
name: Install requirements-dev.txt in '<< parameters.python-environment >>'
command: |
. << parameters.python-environment >>/bin/activate
pip install -q -r requirements-dev.txt
pip install -q -U -r requirements-dev.txt
pip freeze
- run:
name: Install TensorFlow << parameters.tensorflow-version >> in '<< parameters.python-environment >>'
Expand Down Expand Up @@ -94,8 +94,7 @@ commands:
name: Install requirements-dev.txt in '<< parameters.python-environment >>'
command: |
. << parameters.python-environment >>/bin/activate
pip install -q -r requirements-dev.txt
pip install -q -U wheel
pip install -q -U -r requirements-dev.txt
pip freeze
- attach_workspace:
at: ./out
Expand All @@ -112,7 +111,6 @@ commands:
python --version
pip freeze
DIR_TAGGED=./out/merged DIR_WHEEL=./out/wheelhouse make bundle
python -m twine check ./out/wheelhouse/*.whl
tree ./out
- persist_to_workspace:
root: ./out
Expand Down Expand Up @@ -285,7 +283,7 @@ jobs:
name: Configure 'deploy-3.6'
command: |
. deploy-py3.6/bin/activate
pip install -q -U twine
pip install -q -U -r requirements-dev.txt
- run:
name: Upload to PyPI
command: |
Expand Down
3 changes: 3 additions & 0 deletions bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,18 @@ if [ $OS_NAME == "darwin" ]; then
pushd ${TMP}
python setup.py bdist_wheel > /dev/null
popd
python -m twine check ${TMP}/dist/*.whl
cp ${TMP}/dist/*.whl ${OUT}

elif [ $OS_NAME == "linux" ]; then
pushd ${TMP}
python setup.py bdist_wheel > /dev/null
auditwheel repair dist/*.whl
popd
python -m twine check ${TMP}/wheelhouse/*.whl
cp ${TMP}/wheelhouse/*.whl ${OUT}

else
echo "Don't know how to bundle package for '$OS_NAME'"
exit 1
fi
3 changes: 3 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
cpplint==1.4.4
numpy==1.16.4
pip==19.2.3
setuptools==41.2.0
twine==1.13.0
wheel==0.33.6

0 comments on commit 4bcd9f1

Please sign in to comment.