From cde1eb84bd1813ff4425fe6f05cbdeba8e410c13 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Thu, 15 Jan 2015 23:25:04 +0100 Subject: Use unittest.mock from standard library instead of external mock with Python >=3.3. --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b4b93b38..63093917 100755 --- a/setup.py +++ b/setup.py @@ -170,8 +170,7 @@ setup_params = dict( tests_require=[ 'setuptools[ssl]', 'pytest', - 'mock', - ], + ] + (['mock'] if sys.version_info[:2] < (3, 3) else []), setup_requires=[ ] + pytest_runner, ) -- cgit v1.2.1 From 47236e6fff9884a1bb4a023a7c0a3ea56819f212 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Thu, 22 Jan 2015 14:01:28 +0000 Subject: Reintroduce use of setup_requirements writer This was originally removed due to an underlying issue (#315) with the upgrade code, which combined with this writer caused upgrades to fail. Issue #315 is resolved now so we can add this writer back. --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 63093917..d02b7875 100755 --- a/setup.py +++ b/setup.py @@ -126,6 +126,7 @@ setup_params = dict( "egg_info.writers": [ "PKG-INFO = setuptools.command.egg_info:write_pkg_info", "requires.txt = setuptools.command.egg_info:write_requirements", + "setup_requires.txt = setuptools.command.egg_info:write_setup_requirements", "entry_points.txt = setuptools.command.egg_info:write_entries", "eager_resources.txt = setuptools.command.egg_info:overwrite_arg", "namespace_packages.txt = setuptools.command.egg_info:overwrite_arg", -- cgit v1.2.1 From 02fac66f96af6b6952d227809186db1c5ae628a6 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 24 Feb 2015 22:36:06 -0600 Subject: Use rst.linker for generating linked changelog --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 63093917..9d4330ac 100755 --- a/setup.py +++ b/setup.py @@ -172,6 +172,7 @@ setup_params = dict( 'pytest', ] + (['mock'] if sys.version_info[:2] < (3, 3) else []), setup_requires=[ + 'rst.linker', ] + pytest_runner, ) -- cgit v1.2.1 From 70b0594ff0d67dba65feb59a606007768eced05b Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 25 Feb 2015 08:51:24 -0500 Subject: Only require rst.linker when docs commands are invoked. Also specify sphinx dependency. --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9d4330ac..807c0180 100755 --- a/setup.py +++ b/setup.py @@ -76,6 +76,8 @@ if sys.platform == 'win32' or force_windows_specific_files: package_data.setdefault('setuptools.command', []).extend(['*.xml']) pytest_runner = ['pytest-runner'] if 'ptr' in sys.argv else [] +needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv) +sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else [] setup_params = dict( name="setuptools", @@ -172,8 +174,7 @@ setup_params = dict( 'pytest', ] + (['mock'] if sys.version_info[:2] < (3, 3) else []), setup_requires=[ - 'rst.linker', - ] + pytest_runner, + ] + sphinx + pytest_runner, ) if __name__ == '__main__': -- cgit v1.2.1 From 34bd844443954929c7199e772e715ed6f0669332 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 25 Feb 2015 08:52:48 -0500 Subject: Update conditional setup-time dependency to also support pytest and test commands. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 807c0180..e1b302a3 100755 --- a/setup.py +++ b/setup.py @@ -75,7 +75,8 @@ if sys.platform == 'win32' or force_windows_specific_files: package_data.setdefault('setuptools', []).extend(['*.exe']) package_data.setdefault('setuptools.command', []).extend(['*.xml']) -pytest_runner = ['pytest-runner'] if 'ptr' in sys.argv else [] +needs_pytest = set(['ptr', 'pytest', 'test']) in sys.argv else [] +pytest_runner = ['pytest-runner'] if needs_pytest else [] needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv) sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else [] -- cgit v1.2.1 From 3bf060e378ce5d942079452450864ef30bdaa44f Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 25 Feb 2015 09:03:49 -0500 Subject: Correct usage in needs_pytest --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index e1b302a3..438e512b 100755 --- a/setup.py +++ b/setup.py @@ -75,7 +75,7 @@ if sys.platform == 'win32' or force_windows_specific_files: package_data.setdefault('setuptools', []).extend(['*.exe']) package_data.setdefault('setuptools.command', []).extend(['*.xml']) -needs_pytest = set(['ptr', 'pytest', 'test']) in sys.argv else [] +needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv) pytest_runner = ['pytest-runner'] if needs_pytest else [] needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv) sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else [] -- cgit v1.2.1 From fe899eef84b75a58aeb443e36904e9f4a5fd5c20 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 4 Mar 2015 10:10:44 -0500 Subject: Reindent header --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 021e7fee..7a404f82 100755 --- a/setup.py +++ b/setup.py @@ -1,5 +1,8 @@ #!/usr/bin/env python -"""Distutils setup file, used to install or test 'setuptools'""" +""" +Distutils setup file, used to install or test 'setuptools' +""" + import io import os import sys -- cgit v1.2.1 From ee36e46917421eb503f2e6d41f7421463564845b Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 5 Mar 2015 19:28:34 -0500 Subject: Backed out changeset: 8bff4399a7af; Fixes #356 --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 7a404f82..5d98de06 100755 --- a/setup.py +++ b/setup.py @@ -132,7 +132,6 @@ setup_params = dict( "egg_info.writers": [ "PKG-INFO = setuptools.command.egg_info:write_pkg_info", "requires.txt = setuptools.command.egg_info:write_requirements", - "setup_requires.txt = setuptools.command.egg_info:write_setup_requirements", "entry_points.txt = setuptools.command.egg_info:write_entries", "eager_resources.txt = setuptools.command.egg_info:overwrite_arg", "namespace_packages.txt = setuptools.command.egg_info:overwrite_arg", -- cgit v1.2.1 From 4e0a8cd8f37e4f427a75cac454bea4aca0c4ea0c Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 5 Mar 2015 19:37:20 -0500 Subject: Remove build_py (unused) --- setup.py | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 5d98de06..234a7885 100755 --- a/setup.py +++ b/setup.py @@ -28,7 +28,6 @@ with open(ver_path) as ver_file: exec(ver_file.read(), main_ns) import setuptools -from setuptools.command.build_py import build_py as _build_py scripts = [] @@ -49,20 +48,6 @@ def _gen_console_scripts(): console_scripts = list(_gen_console_scripts()) - -# specific command that is used to generate windows .exe files -class build_py(_build_py): - def build_package_data(self): - """Copy data files into build directory""" - for package, src_dir, build_dir, filenames in self.data_files: - for filename in filenames: - target = os.path.join(build_dir, filename) - self.mkpath(os.path.dirname(target)) - srcfile = os.path.join(src_dir, filename) - outf, copied = self.copy_file(srcfile, target) - srcfile = os.path.abspath(srcfile) - - readme_file = io.open('README.txt', encoding='utf-8') with readme_file: -- cgit v1.2.1 From 8b78e4b3bb977323247073fa99de62fdf8571630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= Date: Sat, 16 May 2015 15:56:43 +0300 Subject: Don't install tests in site-packages --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 234a7885..afaf9f61 100755 --- a/setup.py +++ b/setup.py @@ -80,7 +80,7 @@ setup_params = dict( keywords="CPAN PyPI distutils eggs package management", url="https://bitbucket.org/pypa/setuptools", src_root=src_root, - packages=setuptools.find_packages(), + packages=setuptools.find_packages(exclude=['*.tests']), package_data=package_data, py_modules=['easy_install'], -- cgit v1.2.1 From e5c83ccacb4e61147cb75f4edbe15d68b304b1c5 Mon Sep 17 00:00:00 2001 From: grizzlynyo Date: Sat, 29 Aug 2015 17:29:49 +0300 Subject: update dependency links --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index afaf9f61..4a487924 100755 --- a/setup.py +++ b/setup.py @@ -151,10 +151,10 @@ setup_params = dict( """).strip().splitlines(), extras_require={ "ssl:sys_platform=='win32'": "wincertstore==0.2", - "certs": "certifi==1.0.1", + "certs": "certifi==2015.04.28", }, dependency_links=[ - 'https://pypi.python.org/packages/source/c/certifi/certifi-1.0.1.tar.gz#md5=45f5cb94b8af9e1df0f9450a8f61b790', + 'https://pypi.python.org/packages/source/c/certifi/certifi-2015.04.28.tar.gz#md5=12c7c3a063b2ff97a0f8291d8de41e8c', 'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2', ], scripts=[], -- cgit v1.2.1 From 7f8157b378c7e03ef332a59b63c08b375876b976 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 3 Sep 2015 09:46:44 -0400 Subject: Setuptools supports Python 3.5 and 3.6 --- setup.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4a487924..1a425747 100755 --- a/setup.py +++ b/setup.py @@ -144,6 +144,8 @@ setup_params = dict( Programming Language :: Python :: 3.2 Programming Language :: Python :: 3.3 Programming Language :: Python :: 3.4 + Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 Topic :: Software Development :: Libraries :: Python Modules Topic :: System :: Archiving :: Packaging Topic :: System :: Systems Administration -- cgit v1.2.1 From 421db46870409b6b0cf797dac8869fddc8156191 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 6 Sep 2015 13:59:27 -0400 Subject: Python 3.6 isn't yet a thing, apparently. --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 1a425747..2b367a6d 100755 --- a/setup.py +++ b/setup.py @@ -145,7 +145,6 @@ setup_params = dict( Programming Language :: Python :: 3.3 Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.5 - Programming Language :: Python :: 3.6 Topic :: Software Development :: Libraries :: Python Modules Topic :: System :: Archiving :: Packaging Topic :: System :: Systems Administration -- cgit v1.2.1 From ae6c73f07680da77345f5ccfac4facde30ad4d7e Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 22 Oct 2015 16:57:13 -0400 Subject: Dropping support for Python 3.2 and earlier Python 3 versions. Currently only log a warning, but future versions will fail. --- setup.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2b367a6d..6226111d 100755 --- a/setup.py +++ b/setup.py @@ -140,8 +140,6 @@ setup_params = dict( Programming Language :: Python :: 2.6 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.1 - Programming Language :: Python :: 3.2 Programming Language :: Python :: 3.3 Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.5 -- cgit v1.2.1 From 68e4344ceaff4dd88ffbfbf5370639cc854a8af8 Mon Sep 17 00:00:00 2001 From: grizzlynyo Date: Sat, 21 Nov 2015 14:13:19 +0200 Subject: update certifi to 2015.11.20 --HG-- branch : sync_certifi --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 6226111d..9d7f228d 100755 --- a/setup.py +++ b/setup.py @@ -150,10 +150,10 @@ setup_params = dict( """).strip().splitlines(), extras_require={ "ssl:sys_platform=='win32'": "wincertstore==0.2", - "certs": "certifi==2015.04.28", + "certs": "certifi==2015.11.20", }, dependency_links=[ - 'https://pypi.python.org/packages/source/c/certifi/certifi-2015.04.28.tar.gz#md5=12c7c3a063b2ff97a0f8291d8de41e8c', + 'https://pypi.python.org/packages/source/c/certifi/certifi-2015.11.20.tar.gz#md5=25134646672c695c1ff1593c2dd75d08', 'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2', ], scripts=[], -- cgit v1.2.1 From 7cb174c62560328ed051bb9596c4926c8577d3d0 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 1 Dec 2015 13:06:48 -0500 Subject: Force later pytest --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9d7f228d..dfb578a1 100755 --- a/setup.py +++ b/setup.py @@ -159,7 +159,7 @@ setup_params = dict( scripts=[], tests_require=[ 'setuptools[ssl]', - 'pytest', + 'pytest>=2.8', ] + (['mock'] if sys.version_info[:2] < (3, 3) else []), setup_requires=[ ] + sphinx + pytest_runner, -- cgit v1.2.1