From 3a19adb976393dc4066def880d0db11e2f7378d7 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Sun, 15 Dec 2013 14:16:53 +0900 Subject: Drop python-2.5 and remove 2.4,2.5 support codes --- setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 553cf12d..543a319d 100644 --- a/setup.py +++ b/setup.py @@ -44,20 +44,20 @@ A development egg can be found `here `_. ''' +if sys.version_info < (2, 6): + print('ERROR: Sphinx requires at least Python 2.6 to run.') + sys.exit(1) + requires = ['Pygments>=1.2', 'docutils>=0.7'] if sys.version_info[:3] >= (3, 3, 0): requires[1] = 'docutils>=0.10' -if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 3): +if (3, 0) <= sys.version_info < (3, 3): requires.append('Jinja2>=2.3,<2.7') -else: +else: # 2.6, 2.7, 3.3 or later requires.append('Jinja2>=2.3') -if sys.version_info < (2, 5): - print('ERROR: Sphinx requires at least Python 2.5 to run.') - sys.exit(1) - # tell distribute to use 2to3 with our own fixers extra = {} if sys.version_info >= (3, 0): -- cgit v1.2.1 From 8b375619a7a91d26f07f1ba944757700ae82827f Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Sun, 15 Dec 2013 16:04:23 +0900 Subject: Drop python-3.1 and remove support codes --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 543a319d..53a4c04b 100644 --- a/setup.py +++ b/setup.py @@ -44,8 +44,8 @@ A development egg can be found `here `_. ''' -if sys.version_info < (2, 6): - print('ERROR: Sphinx requires at least Python 2.6 to run.') +if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 2): + print('ERROR: Sphinx requires at least Python 2.6 or 3.2 to run.') sys.exit(1) requires = ['Pygments>=1.2', 'docutils>=0.7'] -- cgit v1.2.1 From 22bff8279d4d2d0096152337ae2b6b3951f92e29 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Sun, 15 Dec 2013 16:25:01 +0900 Subject: Drop docutils-0.7, 0.8 and 0.9 support --- setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 53a4c04b..0f6835b3 100644 --- a/setup.py +++ b/setup.py @@ -48,10 +48,7 @@ if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 2): print('ERROR: Sphinx requires at least Python 2.6 or 3.2 to run.') sys.exit(1) -requires = ['Pygments>=1.2', 'docutils>=0.7'] - -if sys.version_info[:3] >= (3, 3, 0): - requires[1] = 'docutils>=0.10' +requires = ['Pygments>=1.2', 'docutils>=0.10'] if (3, 0) <= sys.version_info < (3, 3): requires.append('Jinja2>=2.3,<2.7') -- cgit v1.2.1 From f0313936b4f14fd2c45eef91adfa4d31c09afe87 Mon Sep 17 00:00:00 2001 From: Yoshiki Shibukawa Date: Mon, 20 Jan 2014 02:09:21 -0800 Subject: add 14 languages search support --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 553cf12d..f13c5047 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ A development egg can be found `here `_. ''' -requires = ['Pygments>=1.2', 'docutils>=0.7'] +requires = ['Pygments>=1.2', 'docutils>=0.7', 'snowballstemmer>=1.1'] if sys.version_info[:3] >= (3, 3, 0): requires[1] = 'docutils>=0.10' -- cgit v1.2.1 From 5e9df0d136140d5b2aba94319ecba7ec541c7446 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Tue, 29 Apr 2014 11:46:47 +0900 Subject: introduce the six module and reduce sphinx.util.pycompat implementation. refs #1350. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a92c93b4..92c489fb 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 2): print('ERROR: Sphinx requires at least Python 2.6 or 3.2 to run.') sys.exit(1) -requires = ['Pygments>=1.2', 'docutils>=0.10', 'snowballstemmer>=1.1'] +requires = ['six', 'Pygments>=1.2', 'docutils>=0.10', 'snowballstemmer>=1.1'] if (3, 0) <= sys.version_info < (3, 3): requires.append('Jinja2>=2.3,<2.7') -- cgit v1.2.1 From 8802cbe037c7b90d04220865aa376020360e6226 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Thu, 1 May 2014 17:27:27 +0900 Subject: remove 2to3. #1350. --- setup.py | 9 --------- 1 file changed, 9 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 92c489fb..2e61e208 100644 --- a/setup.py +++ b/setup.py @@ -52,14 +52,6 @@ if (3, 0) <= sys.version_info < (3, 3): else: # 2.6, 2.7, 3.3 or later requires.append('Jinja2>=2.3') -# tell distribute to use 2to3 with our own fixers -extra = {} -if sys.version_info >= (3, 0): - extra.update( - use_2to3=True, - use_2to3_fixers=['custom_fixers'] - ) - # Provide a "compile_catalog" command that also creates the translated # JavaScript files if Babel is available. @@ -196,5 +188,4 @@ setup( }, install_requires=requires, cmdclass=cmdclass, - **extra ) -- cgit v1.2.1 From 9480e1e9845500457562e750290c271e288e4a0f Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Sat, 3 May 2014 13:26:36 +0900 Subject: remove custom_fixers. it is not needed anymore. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 2e61e208..4229c953 100644 --- a/setup.py +++ b/setup.py @@ -173,7 +173,7 @@ setup( 'Topic :: Utilities', ], platforms='any', - packages=find_packages(exclude=['custom_fixers', 'test']), + packages=find_packages(exclude=['test']), include_package_data=True, entry_points={ 'console_scripts': [ -- cgit v1.2.1 From 88fe3b0b04f3fff0fce6c9b99d5da73dd5dda880 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Tue, 27 May 2014 23:17:36 +0900 Subject: * Drop Python-3.2. And now, removing 2to3 mechanism procedure has been completed. Closes #1350. Pygments-2.0 will drop Python-3.2. The snowballstemmer package that is referred from sphinx-1.3 (that is merged at pull request #214) has not supported Python-3.2. We decided to drop the Python-3.2. see also https://bitbucket.org/birkenfeld/sphinx/pull-request/243/native-py2-py3-support-without-2to3-refs --- setup.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4229c953..a0004197 100644 --- a/setup.py +++ b/setup.py @@ -41,16 +41,13 @@ Among its features are the following: * Setuptools integration ''' -if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 2): - print('ERROR: Sphinx requires at least Python 2.6 or 3.2 to run.') +if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 3): + print('ERROR: Sphinx requires at least Python 2.6 or 3.3 to run.') sys.exit(1) -requires = ['six', 'Pygments>=1.2', 'docutils>=0.10', 'snowballstemmer>=1.1'] - -if (3, 0) <= sys.version_info < (3, 3): - requires.append('Jinja2>=2.3,<2.7') -else: # 2.6, 2.7, 3.3 or later - requires.append('Jinja2>=2.3') +requires = [ + 'six', 'Jinja2>=2.3', 'Pygments>=1.2', 'docutils>=0.10', 'snowballstemmer>=1.1' +] # Provide a "compile_catalog" command that also creates the translated # JavaScript files if Babel is available. -- cgit v1.2.1 From 67d66af4700d5468c82b5ebb6b6bfa25fd43ad49 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Sat, 5 Jul 2014 01:16:33 +0900 Subject: Windows color console support. update for pull request #252. --- setup.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index a0004197..4ebdc81f 100644 --- a/setup.py +++ b/setup.py @@ -49,6 +49,9 @@ requires = [ 'six', 'Jinja2>=2.3', 'Pygments>=1.2', 'docutils>=0.10', 'snowballstemmer>=1.1' ] +if sys.platform == 'win32': + requires.append('colorama') + # Provide a "compile_catalog" command that also creates the translated # JavaScript files if Babel is available. -- cgit v1.2.1 From 3b99e797bb08d8a058fdfa7237076341e72aa94e Mon Sep 17 00:00:00 2001 From: anatoly techtonik Date: Mon, 28 Jul 2014 09:04:32 +0000 Subject: raise six requirement to 1.4+ when UserString was added --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4ebdc81f..b41ea075 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 3): sys.exit(1) requires = [ - 'six', 'Jinja2>=2.3', 'Pygments>=1.2', 'docutils>=0.10', 'snowballstemmer>=1.1' + 'six>=1.4', 'Jinja2>=2.3', 'Pygments>=1.2', 'docutils>=0.10', 'snowballstemmer>=1.1' ] if sys.platform == 'win32': -- cgit v1.2.1 From 46f5259d78e51ffce1fdb52f9a51f419e4d8015d Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Sun, 3 Aug 2014 16:22:08 +0900 Subject: Automatically compile ``*.mo`` files from ``*.po`` files. --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index b41ea075..0696d6ab 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,12 @@ if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 3): sys.exit(1) requires = [ - 'six>=1.4', 'Jinja2>=2.3', 'Pygments>=1.2', 'docutils>=0.10', 'snowballstemmer>=1.1' + 'six>=1.4', + 'Jinja2>=2.3', + 'Pygments>=1.2', + 'docutils>=0.10', + 'snowballstemmer>=1.1', + 'babel', ] if sys.platform == 'win32': -- cgit v1.2.1