Skip to content

Commit 71b20ac

Browse files
committed
fix travis twine and prepare for release
1 parent f910815 commit 71b20ac

File tree

4 files changed

+14
-19
lines changed

4 files changed

+14
-19
lines changed

.travis.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ cache:
4444
- $HOME/downloads
4545

4646
before_install:
47-
- |
48-
# Workaround the following error occuring because python installation is cached but gettext dependency is not
49-
# dyld: Library not loaded: /usr/local/opt/gettext/lib/libintl.8.dylib
50-
# Referenced from: /Users/travis/.pyenv/versions/3.7.2/bin/python
51-
# Reason: Incompatible library version: python requires version 11.0.0 or later, but libintl.8.dylib provides version 10.0.0
52-
if [[ "$TRAVIS_OS_NAME" == "osx" && "${PYTHON_VERSION}" == "3.7.8" ]]; then
53-
brew install gettext
54-
fi
5547
- |
5648
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
5749
mkdir $HOME/bin; ln -s $(which pip2) $HOME/bin/pip; ln -s $(which python2) $HOME/bin/python;
@@ -66,38 +58,40 @@ before_install:
6658
--env TRAVIS=True \
6759
--env TRAVIS_OS_NAME="${TRAVIS_OS_NAME}" \
6860
quay.io/pypa/manylinux2014_$(arch) bash
69-
docker exec -it python-ninja /io/scripts/docker-build.sh ci_before_install
61+
docker exec -it python-ninja /io/scripts/manylinux2014-aarch64-build-and-test-wheel.sh ci_before_install
7062
fi
7163
7264
install:
7365
- |
7466
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
7567
ci install
7668
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
77-
docker exec -it python-ninja /io/scripts/docker-build.sh ci_install
69+
pip install twine
70+
docker exec -it python-ninja /io/scripts/manylinux2014-aarch64-build-and-test-wheel.sh ci_install
7871
fi
7972
8073
script:
8174
- |
8275
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
8376
ci test
8477
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
85-
docker exec -it python-ninja /io/scripts/docker-build.sh ci_script
78+
docker exec -it python-ninja /io/scripts/manylinux2014-aarch64-build-and-test-wheel.sh ci_script
8679
fi
8780
8881
after_success:
8982
- |
9083
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
9184
ci after_test
9285
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
93-
docker exec -it python-ninja /io/scripts/docker-build.sh ci_after_success
86+
docker exec -it python-ninja /io/scripts/manylinux2014-aarch64-build-and-test-wheel.sh ci_after_success
9487
docker stop python-ninja
9588
fi
89+
pwd && ls dist; PATH=~/.pyenv/versions/${PYTHON_VERSION}/bin/:$PATH && twine --version
9690
9791
deploy:
9892
# deploy-release
9993
- provider: script
100-
script: pwd && ls dist;echo "deploy-release" && ~/.pyenv/versions/${PYTHON_VERSION}/bin/twine upload -u $PYPI_USER -p $PYPI_PASSWORD --skip-existing dist/*
94+
script: pwd && ls dist;echo "deploy-release" && PATH=~/.pyenv/versions/${PYTHON_VERSION}/bin/:$PATH && twine upload -u $PYPI_USER -p $PYPI_PASSWORD --skip-existing dist/*
10195
skip_cleanup: true
10296
on:
10397
repo: ${TRAVIS_REPO_SLUG}

README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ Build Status
2626

2727
.. table::
2828

29-
+---------------+------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+
30-
| | Linux | macOS | Windows |
31-
+===============+==========================================================================================+==============================================================================================+===========================================================================================================+
32-
| PyPI | .. image:: https://circleci.com/gh/scikit-build/ninja-python-distributions.svg?style=svg | .. image:: https://travis-ci.org/scikit-build/ninja-python-distributions.svg?branch=master | .. image:: https://ci.appveyor.com/api/projects/status/cvgsgfo2rsyq2ej8/branch/master?svg=true |
33-
| | :target: https://circleci.com/gh/scikit-build/ninja-python-distributions | :target: https://travis-ci.org/scikit-build/ninja-python-distributions | :target: https://ci.appveyor.com/project/scikit-build/ninja-python-distributions/branch/master |
34-
+---------------+------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+
29+
+---------------+------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
30+
| | Linux | Linux aarch64 | macOS | Windows |
31+
+===============+==========================================================================================+==============================================================================================+==============================================================================================+===========================================================================================================+
32+
| PyPI | .. image:: https://circleci.com/gh/scikit-build/ninja-python-distributions.svg?style=svg | .. image:: https://travis-ci.com/scikit-build/ninja-python-distributions.svg?branch=master | .. image:: https://travis-ci.com/scikit-build/ninja-python-distributions.svg?branch=master | .. image:: https://ci.appveyor.com/api/projects/status/cvgsgfo2rsyq2ej8/branch/master?svg=true |
33+
| | :target: https://circleci.com/gh/scikit-build/ninja-python-distributions | :target: https://travis-ci.com/scikit-build/ninja-python-distributions | :target: https://travis-ci.com/scikit-build/ninja-python-distributions | :target: https://ci.appveyor.com/project/scikit-build/ninja-python-distributions/branch/master |
34+
+---------------+------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------+
3535

3636
Maintainers
3737
-----------

requirements-dev.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
codecov>=2.0.5
22
coverage>=4.2
3+
cryptography==3.2.1
34
flake8>=3.0.4
45
pytest>=4.5.0
56
pytest-cov>=2.7.1

0 commit comments

Comments
 (0)