Skip to content

Commit f53277e

Browse files
authored
Merge pull request #8 from Clever/INFRA-3186-circleci-2
[INFRA-3186] autotranslate CircleCI 1.0 -> 2.0
2 parents 0ece8d1 + dfddb84 commit f53277e

3 files changed

Lines changed: 24 additions & 8 deletions

File tree

.circleci/config.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: 2
2+
jobs:
3+
build:
4+
working_directory: ~/Clever/discovery-python
5+
docker:
6+
- image: circleci/python:2.7
7+
environment:
8+
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
9+
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
10+
steps:
11+
- run: sudo pip install --force-reinstall pip==9.0.3
12+
- run:
13+
command: cd $HOME && git clone --depth 1 -v https://github.com/Clever/ci-scripts.git && cd ci-scripts && git show --oneline -s
14+
name: Clone ci-scripts
15+
- checkout
16+
- run:
17+
command: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
18+
name: Set up CircleCI artifacts directories
19+
- run: sudo make deps
20+
- run: sudo make test

circle.yml

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

setup.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
import os
44
import sys
55
from setuptools import setup, find_packages
6-
from pip.req import parse_requirements
7-
6+
try: # for pip >= 10
7+
from pip._internal.req import parse_requirements
8+
except ImportError: # for pip <= 9.0.3
9+
from pip.req import parse_requirements
810
import pkg_resources
911

1012
here = os.path.abspath(os.path.dirname(__file__))

0 commit comments

Comments
 (0)