Skip to content

Commit d1eae76

Browse files
authored
Merge pull request #11 from Clever/python-migration-UpgradePython
Python migration upgrade python
2 parents e3744fb + 0607731 commit d1eae76

6 files changed

Lines changed: 14 additions & 12 deletions

File tree

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ jobs:
33
build:
44
working_directory: ~/Clever/discovery-python
55
docker:
6-
- image: circleci/python:2.7
6+
- image: cimg/python:3.9.12
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
11+
- run: pip3 install --force-reinstall pip==22.0.4
1212
- run:
1313
command: cd $HOME && git clone --depth 1 -v https://github.com/Clever/ci-scripts.git && cd ci-scripts && git show --oneline -s
1414
name: Clone ci-scripts
1515
- checkout
1616
- run:
1717
command: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
1818
name: Set up CircleCI artifacts directories
19-
- run: sudo make deps
20-
- run: sudo make test
19+
- run: make deps
20+
- run: make test

CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## 1.0.0 (2022-04-21)
2+
- Update to Python 3
13
## 0.1.1 (2016-05-24)
24
- Update to be compatible with the latest version of kayvee
35

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ clean:
77
find -type f -name '*.pyc' -delete
88

99
deps:
10-
python setup.py develop
10+
python3 setup.py develop
1111

1212
format:
1313
autopep8 -i -r -j0 -a --experimental --max-line-length 100 --indent-size 2 .
@@ -19,4 +19,4 @@ publish:
1919
./publish.sh
2020

2121
test: deps
22-
nosetests ./test
22+
python3 -m "nose" test

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.1
1+
1.0.0

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
kayvee==2.0.2
1+
kayvee==3.0.0
2+
future>=0.18.2

setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env python
22

3+
from builtins import str
34
import os
45
import sys
56
from setuptools import setup, find_packages
@@ -14,9 +15,7 @@
1415
with open(os.path.join(here, 'VERSION')) as f:
1516
VERSION = f.read().strip()
1617

17-
pr_kwargs = {}
18-
if pkg_resources.get_distribution("pip").version >= '6.0':
19-
pr_kwargs = {"session": False}
18+
pr_kwargs = {"session": False}
2019

2120
install_reqs = parse_requirements(
2221
os.path.join(
@@ -31,7 +30,7 @@
3130
author_email='tech-notify@clever.com',
3231
url='https://github.com/Clever/discovery-python/',
3332
packages=['discovery'],
34-
install_requires=[str(ir.req) for ir in install_reqs],
33+
install_requires=[str(ir.requirement) for ir in install_reqs],
3534
setup_requires=['nose>=1.0'],
3635
test_suite='nose.collector',
3736
long_description="""\

0 commit comments

Comments
 (0)