Skip to content

Commit 1e86d82

Browse files
committed
FIX: propagate fixes in #90 to pypi_deploy
1 parent 6d2974c commit 1e86d82

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

.circleci/config.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -442,32 +442,35 @@ 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"
465+
deactivate
466+
virtualenv --python=python3 /tmp/install_wheel
467+
source /tmp/install_wheel/bin/activate
468+
python3 -m pip install "setuptools>30.3.0" "pip>=10.0.1"
466469
- run:
467470
name: Build SDCflows in build environment
468471
command: |
469472
source /tmp/build/bin/activate
470-
python setup.py sdist
473+
python setup.py sdist bdist_wheel
471474
- store_artifacts:
472475
path: /tmp/src/sdcflows/dist
473476
- run:
@@ -478,11 +481,11 @@ jobs:
478481
- run:
479482
name: Install sdist package into install environment and check version
480483
command: |
481-
source /tmp/install/bin/activate
484+
source /tmp/install_sdist/bin/activate
482485
THISVERSION=$( python get_version.py )
483486
THISVERSION=${CIRCLE_TAG:-$THISVERSION}
484487
pip install dist/sdcflows*.tar.gz
485-
which sdcflows | grep install\\/bin
488+
which sdcflows | grep install_sdist\\/bin
486489
INSTALLED_VERSION=$(sdcflows --version)
487490
INSTALLED_VERSION=${INSTALLED_VERSION%$'\r'}
488491
INSTALLED_VERSION=${INSTALLED_VERSION#*"sdcflows v"}

0 commit comments

Comments
 (0)