Skip to content

Commit

Permalink
Get rid of py3_compat CI step (#2721)
Browse files Browse the repository at this point in the history
Co-authored-by: Lukasz Maksymczuk <tehasdf@users.noreply.github.com>
  • Loading branch information
mateumann and tehasdf committed Mar 4, 2021
1 parent d379b16 commit e74ab03
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 39 deletions.
27 changes: 0 additions & 27 deletions .circleci/config.yml
Expand Up @@ -186,40 +186,13 @@ jobs:
- run: pip install --user flake8
- run: python -m flake8

py3_compat:
docker:
- image: circleci/python:2.7
steps:
- checkout
- run:
name: install futurize
command: pip install future --user
- run:
name: find python3-incompatible code
command: |
FUTURIZE="futurize ."
while read line; do
[[ "$line" =~ ^#.* ]] && continue
FUTURIZE="${FUTURIZE} ${line}"
done<.circleci/py3fixers
$FUTURIZE>futurize_diffs
- run:
name: check that there is no python3-incompatible code
command: |
if [[ -s futurize_diffs ]]; then
echo "Python-3-incompatible code found"
cat futurize_diffs
exit 1
fi
workflows:
version: 2
build_and_test:
jobs: &build_jobs
- flake8
- test_restservice
- test_amqp_postgres
- py3_compat
- build-rpms
- test_premium
nightly:
Expand Down
13 changes: 1 addition & 12 deletions jenkins/Jenkinsfile
Expand Up @@ -152,17 +152,6 @@ pipeline {
}
}
}
stage('py3_compat') {
steps {
sh script: "mkdir -p ${env.WORKSPACE}/py3_compat && cp -rf ${env.WORKSPACE}/${env.PROJECT}/. ${env.WORKSPACE}/py3_compat", label: "copying repo to seperate workspace"

container('python-old'){
dir("${env.WORKSPACE}/py3_compat") {
py3Compat()
}
}
}
}
}
}
stage('Run Tests') {
Expand Down Expand Up @@ -235,4 +224,4 @@ pipeline {
}
}
}
}
}

0 comments on commit e74ab03

Please sign in to comment.