diff options
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | ez_setup.py | 2 | ||||
| -rw-r--r-- | setuptools.egg-info/entry_points.txt | 90 | ||||
| -rw-r--r-- | setuptools.egg-info/requires.txt | 8 | ||||
| -rw-r--r-- | setuptools/tests/svn17_example.zip | bin | 19342 -> 0 bytes | |||
| -rw-r--r-- | setuptools/tests/test_svn.py | 20 | ||||
| -rw-r--r-- | setuptools/version.py | 2 |
9 files changed, 61 insertions, 69 deletions
@@ -104,3 +104,4 @@ cc9b19cd0ec64e44308a852e9b9fdc6026ea2e46 1.1.7 4c7dc4ae2440ae3e9ba26b4a12ffca3407e7030d 1.2b1 77921bbe3931caf40474dc36e55d3d541981c749 1.2 19873119647deae8a68e9ed683317b9ee170a8d8 1.3 +a197b626075a8c2e393a08c42a20bd2624a41092 1.3.1 diff --git a/CHANGES.txt b/CHANGES.txt index 6ae840b3..11b8a502 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,12 @@ CHANGES ======= +----- +1.3.1 +----- + +* Remove exuberant warning in SVN support when SVN is not used. + --- 1.3 --- diff --git a/MANIFEST.in b/MANIFEST.in index ff102123..76822cbd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,7 @@ recursive-include setuptools *.py *.txt *.exe *.xml recursive-include tests *.py *.c *.pyx *.txt recursive-include setuptools/tests *.html entries* +recursive-include setuptools/tests/svn_data *.zip recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html recursive-include _markerlib *.py include *.py diff --git a/ez_setup.py b/ez_setup.py index 72d35a5b..4da59fcd 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -29,7 +29,7 @@ try: except ImportError: USER_SITE = None -DEFAULT_VERSION = "1.4" +DEFAULT_VERSION = "1.3.2" DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/" def _python_cmd(*args): diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt index fdf63bf0..73498a4c 100644 --- a/setuptools.egg-info/entry_points.txt +++ b/setuptools.egg-info/entry_points.txt @@ -1,62 +1,62 @@ -[console_scripts] -easy_install = setuptools.command.easy_install:main -easy_install-3.3 = setuptools.command.easy_install:main - -[egg_info.writers] -eager_resources.txt = setuptools.command.egg_info:overwrite_arg -namespace_packages.txt = setuptools.command.egg_info:overwrite_arg -PKG-INFO = setuptools.command.egg_info:write_pkg_info -entry_points.txt = setuptools.command.egg_info:write_entries -requires.txt = setuptools.command.egg_info:write_requirements -top_level.txt = setuptools.command.egg_info:write_toplevel_names -depends.txt = setuptools.command.egg_info:warn_depends_obsolete -dependency_links.txt = setuptools.command.egg_info:overwrite_arg - [distutils.commands] -install = setuptools.command.install:install -install_lib = setuptools.command.install_lib:install_lib -register = setuptools.command.register:register -bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm -test = setuptools.command.test:test -bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst -easy_install = setuptools.command.easy_install:easy_install -setopt = setuptools.command.setopt:setopt -egg_info = setuptools.command.egg_info:egg_info build_ext = setuptools.command.build_ext:build_ext +egg_info = setuptools.command.egg_info:egg_info +setopt = setuptools.command.setopt:setopt +install = setuptools.command.install:install bdist_egg = setuptools.command.bdist_egg:bdist_egg develop = setuptools.command.develop:develop -saveopts = setuptools.command.saveopts:saveopts -sdist = setuptools.command.sdist:sdist -install_scripts = setuptools.command.install_scripts:install_scripts +install_egg_info = setuptools.command.install_egg_info:install_egg_info +bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst +register = setuptools.command.register:register +test = setuptools.command.test:test build_py = setuptools.command.build_py:build_py +install_scripts = setuptools.command.install_scripts:install_scripts rotate = setuptools.command.rotate:rotate -install_egg_info = setuptools.command.install_egg_info:install_egg_info -upload_docs = setuptools.command.upload_docs:upload_docs +saveopts = setuptools.command.saveopts:saveopts +bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm alias = setuptools.command.alias:alias +install_lib = setuptools.command.install_lib:install_lib +easy_install = setuptools.command.easy_install:easy_install +sdist = setuptools.command.sdist:sdist +upload_docs = setuptools.command.upload_docs:upload_docs -[setuptools.installation] -eggsecutable = setuptools.command.easy_install:bootstrap +[egg_info.writers] +requires.txt = setuptools.command.egg_info:write_requirements +entry_points.txt = setuptools.command.egg_info:write_entries +dependency_links.txt = setuptools.command.egg_info:overwrite_arg +depends.txt = setuptools.command.egg_info:warn_depends_obsolete +namespace_packages.txt = setuptools.command.egg_info:overwrite_arg +top_level.txt = setuptools.command.egg_info:write_toplevel_names +eager_resources.txt = setuptools.command.egg_info:overwrite_arg +PKG-INFO = setuptools.command.egg_info:write_pkg_info + +[setuptools.file_finders] +svn_cvs = setuptools.command.sdist:_default_revctrl [distutils.setup_keywords] -dependency_links = setuptools.dist:assert_string_list -entry_points = setuptools.dist:check_entry_points -namespace_packages = setuptools.dist:check_nsp -packages = setuptools.dist:check_packages -zip_safe = setuptools.dist:assert_bool -extras_require = setuptools.dist:check_extras -tests_require = setuptools.dist:check_requirements -use_2to3_fixers = setuptools.dist:assert_string_list +eager_resources = setuptools.dist:assert_string_list +install_requires = setuptools.dist:check_requirements exclude_package_data = setuptools.dist:check_package_data -use_2to3_exclude_fixers = setuptools.dist:assert_string_list test_suite = setuptools.dist:check_test_suite -include_package_data = setuptools.dist:assert_bool -convert_2to3_doctests = setuptools.dist:assert_string_list +packages = setuptools.dist:check_packages +dependency_links = setuptools.dist:assert_string_list +use_2to3_exclude_fixers = setuptools.dist:assert_string_list package_data = setuptools.dist:check_package_data -install_requires = setuptools.dist:check_requirements +namespace_packages = setuptools.dist:check_nsp use_2to3 = setuptools.dist:assert_bool -eager_resources = setuptools.dist:assert_string_list +zip_safe = setuptools.dist:assert_bool test_loader = setuptools.dist:check_importable +convert_2to3_doctests = setuptools.dist:assert_string_list +use_2to3_fixers = setuptools.dist:assert_string_list +tests_require = setuptools.dist:check_requirements +extras_require = setuptools.dist:check_extras +entry_points = setuptools.dist:check_entry_points +include_package_data = setuptools.dist:assert_bool -[setuptools.file_finders] -svn_cvs = setuptools.command.sdist:_default_revctrl +[console_scripts] +easy_install-3.3 = setuptools.command.easy_install:main +easy_install = setuptools.command.easy_install:main + +[setuptools.installation] +eggsecutable = setuptools.command.easy_install:bootstrap diff --git a/setuptools.egg-info/requires.txt b/setuptools.egg-info/requires.txt index 6d385dc7..5ff415da 100644 --- a/setuptools.egg-info/requires.txt +++ b/setuptools.egg-info/requires.txt @@ -1,13 +1,13 @@ -[ssl:python_version in '2.4, 2.5'] -ssl==1.16 +[ssl:sys_platform=='win32'] +wincertstore==0.1 [certs] certifi==0.0.8 -[ssl:sys_platform=='win32'] -wincertstore==0.1 +[ssl:python_version in '2.4, 2.5'] +ssl==1.16 [ssl:sys_platform=='win32' and python_version=='2.4'] ctypes==1.0.2
\ No newline at end of file diff --git a/setuptools/tests/svn17_example.zip b/setuptools/tests/svn17_example.zip Binary files differdeleted file mode 100644 index cfabd2b2..00000000 --- a/setuptools/tests/svn17_example.zip +++ /dev/null diff --git a/setuptools/tests/test_svn.py b/setuptools/tests/test_svn.py index cf98141a..5418b9a4 100644 --- a/setuptools/tests/test_svn.py +++ b/setuptools/tests/test_svn.py @@ -3,7 +3,6 @@ import os -import sys import unittest import codecs from setuptools.tests import environment @@ -11,12 +10,6 @@ from setuptools.compat import unicode, unichr from setuptools import svn_utils -#requires python >= 2.4 -from subprocess import call as _call - -from distutils import log - - class TestSvnVersion(unittest.TestCase): @@ -63,13 +56,6 @@ class ParserInfoXML(unittest.TestCase): data = _read_utf8_file(path) - if ext_spaces: - folder2 = 'third party2' - folder3 = 'third party3' - else: - folder2 = 'third_party2' - folder3 = 'third_party3' - expected = set([ ("\\".join((example_base, 'a file')), 'file'), ("\\".join((example_base, 'folder')), 'dir'), @@ -115,7 +101,7 @@ class ParserExternalXML(unittest.TestCase): expected = set([ os.sep.join((example_base, folder2)), os.sep.join((example_base, folder3)), - #third_party大介 + # folder is third_party大介 os.sep.join((example_base, unicode('third_party') + unichr(0x5927) + unichr(0x4ecb))), @@ -128,7 +114,7 @@ class ParserExternalXML(unittest.TestCase): expected = set(os.path.normpath(x) for x in expected) dir_base = os.sep.join(('C:', 'development', 'svn_example')) - self.assertEqual(set(x for x \ + self.assertEqual(set(x for x in svn_utils.parse_externals_xml(data, dir_base)), expected) def test_svn15(self): @@ -149,7 +135,6 @@ class ParseExternal(unittest.TestCase): def parse_tester(self, svn_name, ext_spaces): path = os.path.join('setuptools', 'tests', 'svn_data', svn_name + '_ext_list.txt') - example_base = svn_name + '_example' data = _read_utf8_file(path) if ext_spaces: @@ -236,4 +221,3 @@ class TestSvn(environment.ZippedEnvironment): def test_suite(): return unittest.defaultTestLoader.loadTestsFromName(__name__) - diff --git a/setuptools/version.py b/setuptools/version.py index 0f663085..e3983324 100644 --- a/setuptools/version.py +++ b/setuptools/version.py @@ -1 +1 @@ -__version__ = '1.4' +__version__ = '1.3.2' |