Skip to content

Commit 8ed800c

Browse files
authored
Merge pull request #91 from mgxd/ci/deploy
FIX: Circle deployment
2 parents a73006b + 39665d1 commit 8ed800c

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

.circleci/config.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ jobs:
410410
name: Check sdist package in build environment
411411
command: |
412412
source /tmp/build/bin/activate
413-
twine check dist/sdcflows*.tar.gz
413+
twine check dist/sdcflows*
414414
- run:
415415
name: Install sdist package into install environment and check version
416416
command: |
@@ -442,47 +442,46 @@ jobs:
442442
443443
deploy_pypi:
444444
machine:
445-
image: circleci/classic:201711-01
445+
image: circleci/python:3.7.4
446446
working_directory: /tmp/src/sdcflows
447447
steps:
448448
- checkout
449449
- run:
450450
name: Setup Python environment with virtualenvs
451451
command: |
452-
pyenv global 3.5.2
453-
python3 -m pip install --upgrade virtualenv
452+
python -m pip install --user --upgrade virtualenv pip
454453
- run:
455454
name: Prepare build environment
456455
command: |
457456
virtualenv --python=python3 /tmp/build
458457
source /tmp/build/bin/activate
459458
python3 -m pip install "setuptools>=30.3.0" "pip>=10.0.1" twine docutils
460459
- run:
461-
name: Prepare install environment
460+
name: Prepare install environments
462461
command: |
463-
virtualenv --python=python3 /tmp/install
464-
source /tmp/install/bin/activate
462+
virtualenv --python=python3 /tmp/install_sdist
463+
source /tmp/install_sdist/bin/activate
465464
python3 -m pip install "setuptools>=30.3.0" "pip>=10.0.1"
466465
- run:
467466
name: Build SDCflows in build environment
468467
command: |
469468
source /tmp/build/bin/activate
470-
python setup.py sdist
469+
python setup.py sdist bdist_wheel
471470
- store_artifacts:
472471
path: /tmp/src/sdcflows/dist
473472
- run:
474-
name: Check sdist package in build environment
473+
name: Check sdist and wheel in build environment
475474
command: |
476475
source /tmp/build/bin/activate
477-
twine check dist/sdcflows*.tar.gz
476+
twine check dist/sdcflows*
478477
- run:
479478
name: Install sdist package into install environment and check version
480479
command: |
481-
source /tmp/install/bin/activate
480+
source /tmp/install_sdist/bin/activate
482481
THISVERSION=$( python get_version.py )
483482
THISVERSION=${CIRCLE_TAG:-$THISVERSION}
484483
pip install dist/sdcflows*.tar.gz
485-
which sdcflows | grep install\\/bin
484+
which sdcflows | grep install_sdist\\/bin
486485
INSTALLED_VERSION=$(sdcflows --version)
487486
INSTALLED_VERSION=${INSTALLED_VERSION%$'\r'}
488487
INSTALLED_VERSION=${INSTALLED_VERSION#*"sdcflows v"}

.github/labeler.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
core:
2+
- sdcflows/cli/*
3+
- sdcflows/interfaces/*
4+
- sdcflows/viz/*
5+
- sdcflows/workflows/*
6+
7+
docs:
8+
- docs/*

0 commit comments

Comments
 (0)