Skip to content

Commit 4b4e28c

Browse files
committed
Linux CI: Rearrange conda build action and remove most of travis.yml
1 parent 546b191 commit 4b4e28c

File tree

6 files changed

+41
-155
lines changed

6 files changed

+41
-155
lines changed

.ci/actions_build_conda.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
# This file is managed by 'repo_helper'. Don't edit it directly.
3+
4+
set -e -x
5+
6+
python -m repo_helper make-recipe || exit 1
7+
8+
# Switch to miniconda
9+
source "/home/runner/miniconda/etc/profile.d/conda.sh"
10+
hash -r
11+
conda activate base
12+
conda config --set always_yes yes --set changeps1 no
13+
conda update -q conda
14+
conda install conda-build
15+
conda install anaconda-client
16+
conda info -a
17+
18+
conda config --add channels domdfcoding || exit 1
19+
20+
conda config --add channels conda-forge || exit 1
21+
22+
conda build conda -c domdfcoding -c conda-forge --output-folder conda/dist --skip-existing
23+
24+
fi
25+
26+
exit 0

.ci/actions_deploy_conda.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,15 @@
33

44
set -e -x
55

6-
python3 -m pip install repo_helper || exit 1
7-
python3 -m repo_helper make-recipe || exit 1
8-
96
# Switch to miniconda
107
source "/home/runner/miniconda/etc/profile.d/conda.sh"
118
hash -r
129
conda activate base
1310
conda config --set always_yes yes --set changeps1 no
1411
conda update -q conda
15-
conda install conda-build
1612
conda install anaconda-client
1713
conda info -a
1814

19-
conda config --add channels domdfcoding || exit 1
20-
21-
conda config --add channels conda-forge || exit 1
22-
23-
conda build conda -c domdfcoding -c conda-forge --output-folder conda/dist --skip-existing
24-
2515
for f in conda/dist/noarch/domdf_python_tools-*.tar.bz2; do
2616
[ -e "$f" ] || continue
2717
echo "$f"

.github/workflows/python_ci_linux.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,17 @@ jobs:
105105
python -m pip install --upgrade pip setuptools wheel
106106
python -m pip install --upgrade tox
107107
108-
- name: Build source distribution 📦
108+
- name: Build distributions 📦
109109
run: |
110110
tox -e build
111-
rm dist/*.whl
111+
112112
113113
- name: Upload distribution 📦 to PyPI
114114
if: startsWith(github.ref, 'refs/tags/')
115115
uses: pypa/gh-action-pypi-publish@master
116116
with:
117117
user: __token__
118-
password: ${{ secrets.pypi_password }}
118+
password: ${{ secrets.PYPI_TOKEN }}
119119
skip_existing: true
120120

121121

@@ -135,12 +135,20 @@ jobs:
135135
- name: Install dependencies 🔧
136136
run: |
137137
python -m pip install --upgrade pip setuptools wheel
138+
python -m pip install --upgrade repo_helper
139+
138140
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
139141
bash miniconda.sh -b -p $HOME/miniconda
140-
chmod +x .ci/actions_deploy_conda.sh
141142
142-
- name: Build and deploy 📦
143+
- name: Build Conda 📦
143144
run: |
145+
chmod +x .ci/actions_build_conda.sh
146+
bash .ci/actions_build_conda.sh
147+
148+
- name: Deploy Conda 🚀
149+
if: startsWith(github.ref, 'refs/tags/')
150+
run: |
151+
chmod +x .ci/actions_deploy_conda.sh
144152
bash .ci/actions_deploy_conda.sh
145153
env:
146154
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}

.travis.yml

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -7,77 +7,20 @@ dist: focal
77
cache: pip
88
python:
99
- '3.6'
10-
- '3.7'
11-
- '3.8'
12-
- 'pypy3'
13-
- '3.9'
14-
- '3.10-dev'
15-
1610
arch:
17-
- amd64
1811
- arm64
1912
install:
2013

2114
- pip install --upgrade pip
2215
- pip install tox tox-travis
23-
- pip install coveralls coverage_pyver_pragma
2416

2517
script:
2618
- tox -vv
27-
after_success:
28-
- coveralls
29-
3019

3120
stages:
3221
- test
33-
- deploy_pypi
3422
- deploy_conda
3523

3624
jobs:
3725
allow_failures:
3826
- arch: arm64
39-
- python: ['3.10-dev']
40-
41-
exclude:
42-
- python: '3.7'
43-
arch: arm64
44-
- python: '3.8'
45-
arch: arm64
46-
- python: 'pypy3'
47-
arch: arm64
48-
- python: '3.9'
49-
arch: arm64
50-
- python: '3.10-dev'
51-
arch: arm64
52-
53-
include:
54-
- stage: test
55-
dist: bionic
56-
python: 3.8
57-
58-
- stage: deploy_pypi
59-
python: "3.6"
60-
script: skip
61-
deploy:
62-
on:
63-
tags: true
64-
repo: domdfcoding/domdf_python_tools
65-
provider: pypi
66-
username: "DomDF"
67-
password:
68-
secure: GQVX7JKDfUWcHQzjmZ8yadF4eIM/AUaXu/Zl8U2hwhB6NavbzUayvMXalT+pfgZ6NaWFMPZOETlxv5d+hf98Io/5HIV4i1KB98ze90KXpUU2Icz7IdxWDWGhc36Vkhb7hU0HUfXLu8WxcxQCJB3t7uIB9SO36dh/cMayW5YvBy3HhluaTvgLax4nOJYjN/FJCgs9kTCBYrjJzheS0pgj37bXZCrB06H0bsxgnbaAiL8FiG6tgJLABDLfqPhtJgVRhtdYeuqGv31/OV0vkj1zG6bExp9ENQ4/5L7FijLRznW+DnsRJt6BdTBtxNxK+v1ZccTdVJzTzhoUH/TbXdI+qtBeatTYz880du7TujKoxfFxGZ9+bSaYURaClMHn7/Ndj7ioj5f51jLf8+BCEk3cWEfUL7yeKF6RBWLww6cFKQ9yDNOiXgrsndz6Oh535LV28rKXS1qeGBppMAv09RmR/YfHu+XMp5yWa+vDwjmrQDH7qEkA3wYYMfMRnwi9+LrOHtS7IqFkgbAXZPmh3C0X1UEqD4cuARcyD9FRU2PAXM1tBprxEFi1L/sv4O8KRP+I3jXXsBHTmzbWWVqXiySGOlX6R9vOma35WS3mkllS/Oz7IyhUtONrwpaLHnuBLKMgi+RnsoEYgLx6KgSXVSQ0JUZq8cP2yewC8nx626w675w=
69-
distributions: "sdist bdist_wheel"
70-
skip_existing: true
71-
- stage: deploy_conda
72-
python: "3.6"
73-
addons:
74-
apt:
75-
update: true
76-
install:
77-
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
78-
- bash miniconda.sh -b -p $HOME/miniconda
79-
- chmod +x .ci/travis_deploy_conda.sh
80-
script: skip
81-
deploy:
82-
provider: script
83-
script: .ci/travis_deploy_conda.sh || return 1;

make_conda_recipe.py

Lines changed: 0 additions & 83 deletions
This file was deleted.

repo_helper.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,5 @@ tox_unmanaged:
7171
- testenv
7272

7373
tox_testenv_extras: all
74+
75+
use_travis: False

0 commit comments

Comments
 (0)