Skip to content

Python migration upgrade python #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garrgordon merged 3 commits into from
Apr 22, 2022
Merged

Python migration upgrade python #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20ed714
updating code to be compatible with python3
garrgordon Apr 21, 2022
6acdb95
update image, dependencies and Makefile
garrgordon Apr 21, 2022
0607731
image correction
garrgordon Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ jobs:
build:
working_directory: ~/Clever/discovery-python
docker:
- image: circleci/python:2.7
- image: cimg/python:3.9.12
environment:
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
steps:
- run: sudo pip install --force-reinstall pip==9.0.3
- run: pip3 install --force-reinstall pip==22.0.4
- run:
command: cd $HOME && git clone --depth 1 -v https://github.com/Clever/ci-scripts.git && cd ci-scripts && git show --oneline -s
name: Clone ci-scripts
- checkout
- run:
command: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
name: Set up CircleCI artifacts directories
- run: sudo make deps
- run: sudo make test
- run: make deps
- run: make test
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## 1.0.0 (2022-04-21)
- Update to Python 3
## 0.1.1 (2016-05-24)
- Update to be compatible with the latest version of kayvee

Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ clean:
find -type f -name '*.pyc' -delete

deps:
python setup.py develop
python3 setup.py develop

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

test: deps
nosetests ./test
python3 -m "nose" test
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.1
1.0.0
3 changes: 2 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
kayvee==2.0.2
kayvee==3.0.0
future>=0.18.2
7 changes: 3 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env python

from builtins import str
import os
import sys
from setuptools import setup, find_packages
Expand All @@ -14,9 +15,7 @@
with open(os.path.join(here, 'VERSION')) as f:
VERSION = f.read().strip()

pr_kwargs = {}
if pkg_resources.get_distribution("pip").version >= '6.0':
pr_kwargs = {"session": False}
pr_kwargs = {"session": False}

install_reqs = parse_requirements(
os.path.join(
Expand All @@ -31,7 +30,7 @@
author_email='tech-notify@clever.com',
url='https://github.com/Clever/discovery-python/',
packages=['discovery'],
install_requires=[str(ir.req) for ir in install_reqs],
install_requires=[str(ir.requirement) for ir in install_reqs],
setup_requires=['nose>=1.0'],
test_suite='nose.collector',
long_description="""\
Expand Down