diff --git a/.circleci/config.yml b/.circleci/config.yml index 7c89035..9fa68cb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,12 +3,12 @@ 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 @@ -16,5 +16,5 @@ jobs: - 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 diff --git a/CHANGES.md b/CHANGES.md index f0a39e7..66ea973 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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 diff --git a/Makefile b/Makefile index 6100a15..dbff16d 100644 --- a/Makefile +++ b/Makefile @@ -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 . @@ -19,4 +19,4 @@ publish: ./publish.sh test: deps - nosetests ./test + python3 -m "nose" test diff --git a/VERSION b/VERSION index 17e51c3..3eefcb9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.1 +1.0.0 diff --git a/requirements.txt b/requirements.txt index 665f7c3..acc2fc2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -kayvee==2.0.2 +kayvee==3.0.0 +future>=0.18.2 diff --git a/setup.py b/setup.py index e0ed596..5308077 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +from builtins import str import os import sys from setuptools import setup, find_packages @@ -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( @@ -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="""\