Skip to content

Commit dfddb84

Browse files
author
Sayan Samanta
committed
python nonsense
1 parent f0852df commit dfddb84

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

.circleci/config.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ jobs:
33
build:
44
working_directory: ~/Clever/discovery-python
55
docker:
6-
- image: circleci/python:2.7.15
6+
- image: circleci/python:2.7
77
environment:
88
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
99
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
1010
steps:
11+
- run: sudo pip install --force-reinstall pip==9.0.3
1112
- run:
1213
command: cd $HOME && git clone --depth 1 -v https://github.com/Clever/ci-scripts.git && cd ci-scripts && git show --oneline -s
1314
name: Clone ci-scripts
1415
- checkout
1516
- run:
1617
command: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
1718
name: Set up CircleCI artifacts directories
18-
- run: make deps
19-
- run: make test
19+
- run: sudo make deps
20+
- run: sudo make test

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)