From 0a1431ed2c638ceb34308d38250eab2717640c49 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 8 Jul 2016 15:49:38 -0700 Subject: fix #1314 --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 0de4ba32..3e5171f9 100644 --- a/setup.py +++ b/setup.py @@ -72,7 +72,6 @@ setup( "lxml>=3.5.0, <3.7", "Pillow>=3.2, <3.3", "passlib>=1.6.5, <1.7", - "psutil>=4.2, <4.4", "pyasn1>=0.1.9, <0.2", "pyOpenSSL>=16.0, <17.0", "pyparsing>=2.1.3, <2.2", -- cgit v1.2.3 From 6f0a733d62277611403a9c70ee9188d5a6cc881e Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sat, 9 Jul 2016 01:29:12 -0700 Subject: Add Python 3.5 markers to setup.py --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 3e5171f9..d1c15734 100644 --- a/setup.py +++ b/setup.py @@ -32,6 +32,8 @@ setup( "Programming Language :: Python", "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.5", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Security", -- cgit v1.2.3 From e89defe9ad4d1660b061d9fdf92b5c325faa2000 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sun, 10 Jul 2016 13:38:49 +0200 Subject: update dependency and loosen restrictions on good citizens --- setup.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index d1c15734..e0bd4545 100644 --- a/setup.py +++ b/setup.py @@ -2,13 +2,13 @@ from setuptools import setup, find_packages from codecs import open import os +from netlib import version + # Based on https://github.com/pypa/sampleproject/blob/master/setup.py # and https://python-packaging-user-guide.readthedocs.org/ here = os.path.abspath(os.path.dirname(__file__)) -from netlib import version - with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f: long_description = f.read() @@ -72,7 +72,7 @@ setup( "html2text>=2016.1.8, <=2016.5.29", "hyperframe>=4.0.1, <5", "lxml>=3.5.0, <3.7", - "Pillow>=3.2, <3.3", + "Pillow>=3.2, <3.4", "passlib>=1.6.5, <1.7", "pyasn1>=0.1.9, <0.2", "pyOpenSSL>=16.0, <17.0", @@ -100,10 +100,10 @@ setup( 'dev': [ "tox>=2.3, <3", "mock>=2.0, <2.1", - "pytest>=2.8.7, <2.10", - "pytest-cov>=2.2.1, <2.3", - "pytest-timeout>=1.0.0, <1.1", - "pytest-xdist>=1.14, <1.15", + "pytest>=2.8.7, <3", + "pytest-cov>=2.2.1, <3", + "pytest-timeout>=1.0.0, <2", + "pytest-xdist>=1.14, <2", "sphinx>=1.3.5, <1.5", "sphinx-autobuild>=0.5.2, <0.7", "sphinxcontrib-documentedlist>=0.4.0, <0.5", -- cgit v1.2.3