From d2192a016dd1c954479053587dffae54a3b58efc Mon Sep 17 00:00:00 2001 From: Pedro Salgado Date: Mon, 14 Nov 2016 16:32:42 -0700 Subject: [PATCH 1/6] updated readthedocs badge. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dbff866..7e77349 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Code Health](https://landscape.io/github/steenzout/python-object/master/landscape.svg?style=flat)](https://landscape.io/github/steenzout/python-object/master) [![Coverage Status](https://coveralls.io/repos/github/steenzout/python-object/badge.svg?branch=master)](https://coveralls.io/r/steenzout/python-object) [![Requirements Status](https://requires.io/github/steenzout/python-object/requirements.svg?branch=master)](https://requires.io/github/steenzout/python-object/requirements/?branch=master) -[![Documentation Status](https://readthedocs.org/projects/python-steenzout-object/badge/?version=latest)](http://python-steenzout-object.readthedocs.io/en/latest/?badge=latest) +[![Documentation Status](https://readthedocs.org/projects/python-steenzout-object/badge/?version=master)](http://python-steenzout-object.readthedocs.io/en/latest/?badge=master) [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)][license] [![Project Stats](https://www.openhub.net/p/python-steenzout-object/widgets/project_thin_badge.gif)](https://www.openhub.net/p/python-steenzout-object/) From 9a757427b5950cda2883b1305a7866437360935a Mon Sep 17 00:00:00 2001 From: Pedro Salgado Date: Wed, 30 Nov 2016 10:33:06 -0700 Subject: [PATCH 2/6] added cache. --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index dd7ab6e..b80a48d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,13 @@ branches: except: - gh-pages +cache: + directories: + - "${HOME}/.pip" + +before_cache: + - "find ${HOME}/.pip -name log -o -name __pycache__ -type d | xargs -I {} rm -rf {}" + matrix: include: - python: 2.7 From de406b797bcb244dcf3582d25501cf5725a334cf Mon Sep 17 00:00:00 2001 From: mikebohdan Date: Mon, 3 Dec 2018 19:04:44 +0200 Subject: [PATCH 3/6] pip 10 support --- requirements.txt | 1 + setup.py | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index e69de29..162c906 100644 --- a/requirements.txt +++ b/requirements.txt @@ -0,0 +1 @@ +semver==2.8.1 diff --git a/setup.py b/setup.py index 6312bd4..2685cca 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,17 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import pip.download +from setuptools import find_packages, setup -from pip.req import parse_requirements +import pip +import semver -from setuptools import find_packages, setup +if 10 >= semver.parse(pip.__version__)['major']: + import pip._internal.download as pip_download + from pip._internal.req import parse_requirements +else: + import pip.download as pip_download + from pip.req import parse_requirements exec(open('steenzout/object/metadata.py').read()) @@ -22,9 +28,9 @@ package_data={'': ['LICENSE', 'NOTICE.md']}, install_requires=[ str(pkg.req) for pkg in parse_requirements( - 'requirements.txt', session=pip.download.PipSession())], + 'requirements.txt', session=pip_download.PipSession())], tests_require=[ str(pkg.req) for pkg in parse_requirements( - 'requirements-test.txt', session=pip.download.PipSession())], + 'requirements-test.txt', session=pip_download.PipSession())], license=__license__, classifiers=__classifiers__) From 065d1e867e5bff619e0247517cfcb8559ae96f3f Mon Sep 17 00:00:00 2001 From: mikebohdan Date: Mon, 3 Dec 2018 19:14:11 +0200 Subject: [PATCH 4/6] new pip versioning support --- requirements.txt | 1 - setup.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 162c906..e69de29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +0,0 @@ -semver==2.8.1 diff --git a/setup.py b/setup.py index 2685cca..9555e17 100644 --- a/setup.py +++ b/setup.py @@ -4,9 +4,8 @@ from setuptools import find_packages, setup import pip -import semver -if 10 >= semver.parse(pip.__version__)['major']: +if 10 <= int(pip.__version__.split('.')[0]): import pip._internal.download as pip_download from pip._internal.req import parse_requirements else: From 0972624ab249964b35d338cea216ac710ab2533c Mon Sep 17 00:00:00 2001 From: mikebohdan Date: Mon, 3 Dec 2018 20:50:04 +0200 Subject: [PATCH 5/6] tox.ini erorr --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index f2b0de7..774304e 100644 --- a/tox.ini +++ b/tox.ini @@ -8,8 +8,8 @@ deps = -rrequirements.txt [testenv] usedevelop = True deps = - -rrequirements.txt - -rrequirements-test.txt + -r requirements.txt + -r requirements-test.txt passenv = HOME LANG LC_ALL From 93d3051ea48dd03655c3b3b685b73fa8b01761e9 Mon Sep 17 00:00:00 2001 From: mikebohdan Date: Mon, 3 Dec 2018 21:15:43 +0200 Subject: [PATCH 6/6] pylint config --- .pylintrc | 2 +- tox.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pylintrc b/.pylintrc index 2dd4439..870597e 100644 --- a/.pylintrc +++ b/.pylintrc @@ -65,7 +65,7 @@ confidence= # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use"--disable=all --enable=classes # --disable=W" -disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,R0903 +disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,R0903,R0205,R1705 [REPORTS] diff --git a/tox.ini b/tox.ini index 774304e..f2b0de7 100644 --- a/tox.ini +++ b/tox.ini @@ -8,8 +8,8 @@ deps = -rrequirements.txt [testenv] usedevelop = True deps = - -r requirements.txt - -r requirements-test.txt + -rrequirements.txt + -rrequirements-test.txt passenv = HOME LANG LC_ALL