pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/py-setuptools Update to 0.7.7. Simplify. Set LIC...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/375710c4b917
branches:  trunk
changeset: 621068:375710c4b917
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jul 04 06:43:12 2013 +0000

description:
Update to 0.7.7. Simplify. Set LICENSE. Allow python-3.x.

-----
0.7.7
-----

* Distribute #375: Repair AttributeError created in last release (redo).
* Issue #30: Added test for get_cache_path.

-----
0.7.6
-----

* Distribute #375: Repair AttributeError created in last release.

-----
0.7.5
-----

* Issue #21: Restore Python 2.4 compatibility in ``test_easy_install``.
* Distribute #375: Merged additional warning from Distribute 0.6.46.
* Now honor the environment variable
  ``SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT`` in addition to the now
  deprecated ``DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT``.

-----
0.7.4
-----

* Issue #20: Fix comparison of parsed SVN version on Python 3.

-----
0.7.3
-----

* Issue #1: Disable installation of Windows-specific files on non-Windows systems.
* Use new sysconfig module with Python 2.7 or >=3.2.

-----
0.7.2
-----

* Issue #14: Use markerlib when the `parser` module is not available.
* Issue #10: ``ez_setup.py`` now uses HTTPS to download setuptools from PyPI.

-----
0.7.1
-----

* Fix NameError (Issue #3) again - broken in bad merge.

---
0.7
---

* Merged Setuptools and Distribute. See docs/merge.txt for details.

Added several features that were slated for setuptools 0.6c12:

* Index URL now defaults to HTTPS.
* Added experimental environment marker support. Now clients may designate a
  PEP-426 environment marker for "extra" dependencies. Setuptools uses this
  feature in ``setup.py`` for optional SSL and certificate validation support
  on older platforms. Based on Distutils-SIG discussions, the syntax is
  somewhat tentative. There should probably be a PEP with a firmer spec before
  the feature should be considered suitable for use.
* Added support for SSL certificate validation when installing packages from
  an HTTPS service.

-----
0.7b4
-----

* Issue #3: Fixed NameError in SSL support.

diffstat:

 devel/py-setuptools/DEINSTALL              |  10 ---
 devel/py-setuptools/INSTALL                |  14 -----
 devel/py-setuptools/Makefile               |  36 +++----------
 devel/py-setuptools/PLIST                  |  78 +++++++++++++++++++++++++++--
 devel/py-setuptools/distinfo               |  10 +-
 devel/py-setuptools/files/easy_install.py  |   9 ---
 devel/py-setuptools/files/manage-eggs.py   |  20 -------
 devel/py-setuptools/patches/patch-aa       |  12 ----
 devel/py-setuptools/patches/patch-setup.py |  16 ++++++
 9 files changed, 102 insertions(+), 103 deletions(-)

diffs (truncated from 322 to 300 lines):

diff -r ecb8a6c60857 -r 375710c4b917 devel/py-setuptools/DEINSTALL
--- a/devel/py-setuptools/DEINSTALL     Thu Jul 04 06:25:23 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1.1.1 2006/11/14 13:33:29 joerg Exp $
-#
-
-case $STAGE in
-DEINSTALL)
-       ${RM} @PYSITELIB@/easy-install.pth
-       ;;
-esac
diff -r ecb8a6c60857 -r 375710c4b917 devel/py-setuptools/INSTALL
--- a/devel/py-setuptools/INSTALL       Thu Jul 04 06:25:23 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1.1.1 2006/11/14 13:33:29 joerg Exp $
-#
-
-case $STAGE in
-POST-INSTALL)
-       cat > @PYSITELIB@/easy-install.pth << EOF
-import sys; sys.__plen = len(sys.path)
-./setuptools-0.6c1-py@PYVERSSUFFIX@.egg
-import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)
-EOF
-       ;;
-esac
diff -r ecb8a6c60857 -r 375710c4b917 devel/py-setuptools/Makefile
--- a/devel/py-setuptools/Makefile      Thu Jul 04 06:25:23 2013 +0000
+++ b/devel/py-setuptools/Makefile      Thu Jul 04 06:43:12 2013 +0000
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.21 2012/10/31 11:19:34 asau Exp $
+# $NetBSD: Makefile,v 1.22 2013/07/04 06:43:12 wiz Exp $
 
-EGG_VERSION=           0.6c11
+EGG_VERSION=           0.7.7
 DISTNAME=              setuptools-${EGG_VERSION}
 EGG_NAME=              setuptools-${EGG_VERSION}
 PKGNAME=               ${PYPKGPREFIX}-setuptools-${EGG_VERSION}
-PKGREVISION=           1
 CATEGORIES=            devel python
 MASTER_SITES=          http://pypi.python.org/packages/source/s/setuptools/
 
 MAINTAINER=            joerg%NetBSD.org@localhost
 HOMEPAGE=              http://peak.telecommunity.com/DevCenter/setuptools
 COMMENT=               New Python packaging system
+LICENSE=               python-software-foundation OR zpl
 
-PYDISTUTILSPKG=                yes
+PYDISTUTILSPKG=                        yes
+PYTHON_VERSIONS_INCLUDE_3X=    yes
 
 PLIST_SUBST+=  PYVERSSUFFIX=${PYVERSSUFFIX} PYPKGPREFIX=${PYPKGPREFIX}
 PLIST_SUBST+=  EGG_NAME=${EGGNAME}
@@ -20,37 +21,20 @@
 PRINT_PLIST_AWK+=      { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/, \
                               "$${EGG_INFODIR}") }
 
-CHECK_FILES_SKIP+=     ${PREFIX}/${PYSITELIB}/easy-install.pth
+REPLACE_PYTHON=                setuptools/command/easy_install.py
+REPLACE_PYTHON+=       setuptools/tests/test_resources.py
 
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../lang/python/extension.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 PYSETUPINSTALLARGS=    --single-version-externally-managed
 .if ${_USE_DESTDIR} == "no"
 PYSETUPINSTALLARGS+=   --root=/
 .endif
 
-FILES_SUBST+=  PYSITELIB=${PREFIX}/${PYSITELIB}
-FILES_SUBST+=  PYVERSSUFFIX=${PYVERSSUFFIX}
-
 .if ${OPSYS} == "Darwin"
 DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 .endif
 
-post-extract:
-       chmod -R go-w ${WRKSRC}
-
-post-build:
-       ${SED} -e 's,@PYTHON@,${PYTHONBIN},' \
-              -e 's,@PYPREFIX@,${PYPKGPREFIX},' \
-              -e 's,@PYSITELIB@,${PREFIX}/${PYSITELIB},' \
-              ${FILESDIR}/manage-eggs.py > ${WRKDIR}/manage-eggs.py
-       ${SED} -e 's,@PYTHON@,${PYTHONBIN},' \
-              -e 's,@PKGVERSION@,${EGG_VERSION},' \
-              ${FILESDIR}/easy_install.py > ${WRKDIR}/easy_install.py
-
-post-install:
-       ${INSTALL_SCRIPT} ${WRKDIR}/manage-eggs.py ${DESTDIR}${PREFIX}/bin/${PYPKGPREFIX}-manage-eggs
-
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ecb8a6c60857 -r 375710c4b917 devel/py-setuptools/PLIST
--- a/devel/py-setuptools/PLIST Thu Jul 04 06:25:23 2013 +0000
+++ b/devel/py-setuptools/PLIST Thu Jul 04 06:43:12 2013 +0000
@@ -1,16 +1,25 @@
-@comment $NetBSD: PLIST,v 1.6 2012/04/08 19:08:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/07/04 06:43:12 wiz Exp $
 bin/easy_install-${PYVERSSUFFIX}
-bin/${PYPKGPREFIX}-manage-eggs
+${PYSITELIB}/_markerlib/__init__.py
+${PYSITELIB}/_markerlib/__init__.pyc
+${PYSITELIB}/_markerlib/__init__.pyo
+${PYSITELIB}/_markerlib/markers.py
+${PYSITELIB}/_markerlib/markers.pyc
+${PYSITELIB}/_markerlib/markers.pyo
 ${PYSITELIB}/easy_install.py
 ${PYSITELIB}/easy_install.pyc
 ${PYSITELIB}/easy_install.pyo
 ${PYSITELIB}/pkg_resources.py
 ${PYSITELIB}/pkg_resources.pyc
 ${PYSITELIB}/pkg_resources.pyo
+${PYSITELIB}/${EGG_INFODIR}/EGG-INFO/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt.orig
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt.orig
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/setuptools/__init__.py
@@ -19,7 +28,6 @@
 ${PYSITELIB}/setuptools/archive_util.py
 ${PYSITELIB}/setuptools/archive_util.pyc
 ${PYSITELIB}/setuptools/archive_util.pyo
-${PYSITELIB}/setuptools/cli.exe
 ${PYSITELIB}/setuptools/command/__init__.py
 ${PYSITELIB}/setuptools/command/__init__.pyc
 ${PYSITELIB}/setuptools/command/__init__.pyo
@@ -83,6 +91,9 @@
 ${PYSITELIB}/setuptools/command/upload.py
 ${PYSITELIB}/setuptools/command/upload.pyc
 ${PYSITELIB}/setuptools/command/upload.pyo
+${PYSITELIB}/setuptools/command/upload_docs.py
+${PYSITELIB}/setuptools/command/upload_docs.pyc
+${PYSITELIB}/setuptools/command/upload_docs.pyo
 ${PYSITELIB}/setuptools/depends.py
 ${PYSITELIB}/setuptools/depends.pyc
 ${PYSITELIB}/setuptools/depends.pyo
@@ -92,25 +103,78 @@
 ${PYSITELIB}/setuptools/extension.py
 ${PYSITELIB}/setuptools/extension.pyc
 ${PYSITELIB}/setuptools/extension.pyo
-${PYSITELIB}/setuptools/gui.exe
 ${PYSITELIB}/setuptools/package_index.py
 ${PYSITELIB}/setuptools/package_index.pyc
 ${PYSITELIB}/setuptools/package_index.pyo
+${PYSITELIB}/setuptools/py24compat.py
+${PYSITELIB}/setuptools/py24compat.pyc
+${PYSITELIB}/setuptools/py24compat.pyo
+${PYSITELIB}/setuptools/py27compat.py
+${PYSITELIB}/setuptools/py27compat.pyc
+${PYSITELIB}/setuptools/py27compat.pyo
 ${PYSITELIB}/setuptools/sandbox.py
 ${PYSITELIB}/setuptools/sandbox.pyc
 ${PYSITELIB}/setuptools/sandbox.pyo
+${PYSITELIB}/setuptools/script template (dev).py
+${PYSITELIB}/setuptools/script template (dev).pyc
+${PYSITELIB}/setuptools/script template (dev).pyo
+${PYSITELIB}/setuptools/script template.py
+${PYSITELIB}/setuptools/script template.pyc
+${PYSITELIB}/setuptools/script template.pyo
+${PYSITELIB}/setuptools/site-patch.py
+${PYSITELIB}/setuptools/site-patch.pyc
+${PYSITELIB}/setuptools/site-patch.pyo
+${PYSITELIB}/setuptools/ssl_support.py
+${PYSITELIB}/setuptools/ssl_support.pyc
+${PYSITELIB}/setuptools/ssl_support.pyo
 ${PYSITELIB}/setuptools/tests/__init__.py
 ${PYSITELIB}/setuptools/tests/__init__.pyc
 ${PYSITELIB}/setuptools/tests/__init__.pyo
 ${PYSITELIB}/setuptools/tests/doctest.py
 ${PYSITELIB}/setuptools/tests/doctest.pyc
 ${PYSITELIB}/setuptools/tests/doctest.pyo
+${PYSITELIB}/setuptools/tests/py26compat.py
+${PYSITELIB}/setuptools/tests/py26compat.pyc
+${PYSITELIB}/setuptools/tests/py26compat.pyo
+${PYSITELIB}/setuptools/tests/server.py
+${PYSITELIB}/setuptools/tests/server.pyc
+${PYSITELIB}/setuptools/tests/server.pyo
+${PYSITELIB}/setuptools/tests/test_bdist_egg.py
+${PYSITELIB}/setuptools/tests/test_bdist_egg.pyc
+${PYSITELIB}/setuptools/tests/test_bdist_egg.pyo
+${PYSITELIB}/setuptools/tests/test_build_ext.py
+${PYSITELIB}/setuptools/tests/test_build_ext.pyc
+${PYSITELIB}/setuptools/tests/test_build_ext.pyo
+${PYSITELIB}/setuptools/tests/test_develop.py
+${PYSITELIB}/setuptools/tests/test_develop.pyc
+${PYSITELIB}/setuptools/tests/test_develop.pyo
+${PYSITELIB}/setuptools/tests/test_dist_info.py
+${PYSITELIB}/setuptools/tests/test_dist_info.pyc
+${PYSITELIB}/setuptools/tests/test_dist_info.pyo
+${PYSITELIB}/setuptools/tests/test_easy_install.py
+${PYSITELIB}/setuptools/tests/test_easy_install.pyc
+${PYSITELIB}/setuptools/tests/test_easy_install.pyo
+${PYSITELIB}/setuptools/tests/test_egg_info.py
+${PYSITELIB}/setuptools/tests/test_egg_info.pyc
+${PYSITELIB}/setuptools/tests/test_egg_info.pyo
+${PYSITELIB}/setuptools/tests/test_markerlib.py
+${PYSITELIB}/setuptools/tests/test_markerlib.pyc
+${PYSITELIB}/setuptools/tests/test_markerlib.pyo
 ${PYSITELIB}/setuptools/tests/test_packageindex.py
 ${PYSITELIB}/setuptools/tests/test_packageindex.pyc
 ${PYSITELIB}/setuptools/tests/test_packageindex.pyo
 ${PYSITELIB}/setuptools/tests/test_resources.py
 ${PYSITELIB}/setuptools/tests/test_resources.pyc
 ${PYSITELIB}/setuptools/tests/test_resources.pyo
-${PYSITELIB}/site.py
-${PYSITELIB}/site.pyc
-${PYSITELIB}/site.pyo
+${PYSITELIB}/setuptools/tests/test_sandbox.py
+${PYSITELIB}/setuptools/tests/test_sandbox.pyc
+${PYSITELIB}/setuptools/tests/test_sandbox.pyo
+${PYSITELIB}/setuptools/tests/test_sdist.py
+${PYSITELIB}/setuptools/tests/test_sdist.pyc
+${PYSITELIB}/setuptools/tests/test_sdist.pyo
+${PYSITELIB}/setuptools/tests/test_test.py
+${PYSITELIB}/setuptools/tests/test_test.pyc
+${PYSITELIB}/setuptools/tests/test_test.pyo
+${PYSITELIB}/setuptools/tests/test_upload_docs.py
+${PYSITELIB}/setuptools/tests/test_upload_docs.pyc
+${PYSITELIB}/setuptools/tests/test_upload_docs.pyo
diff -r ecb8a6c60857 -r 375710c4b917 devel/py-setuptools/distinfo
--- a/devel/py-setuptools/distinfo      Thu Jul 04 06:25:23 2013 +0000
+++ b/devel/py-setuptools/distinfo      Thu Jul 04 06:43:12 2013 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2009/10/31 02:10:34 wiz Exp $
+$NetBSD: distinfo,v 1.8 2013/07/04 06:43:12 wiz Exp $
 
-SHA1 (setuptools-0.6c11.tar.gz) = 8d1ad6384d358c547c50c60f1bfdb3362c6c4a7d
-RMD160 (setuptools-0.6c11.tar.gz) = 7af8f39e5e74d96d10cc0d00b15a26462d66f42c
-Size (setuptools-0.6c11.tar.gz) = 256862 bytes
-SHA1 (patch-aa) = b986fa7ff36e974c70915984efee59f531a488d7
+SHA1 (setuptools-0.7.7.tar.gz) = 55f9285d5f0b1e75f935d57bbe979399b44e0b4a
+RMD160 (setuptools-0.7.7.tar.gz) = 84b28be42f900decfb61adc14c47f8a41999c350
+Size (setuptools-0.7.7.tar.gz) = 754684 bytes
+SHA1 (patch-setup.py) = 8072ebce17d029f7efc1c05528d1e5c0d0f40800
diff -r ecb8a6c60857 -r 375710c4b917 devel/py-setuptools/files/easy_install.py
--- a/devel/py-setuptools/files/easy_install.py Thu Jul 04 06:25:23 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-#!@PYTHON@
-# EASY-INSTALL-ENTRY-SCRIPT: 'setuptools==@PKGVERSION@','console_scripts','easy_install'
-__requires__ = 'setuptools==@PKGVERSION@'
-import sys
-from pkg_resources import load_entry_point
-
-sys.exit(
-   load_entry_point('setuptools==@PKGVERSION@', 'console_scripts', 'easy_install')()
-)
diff -r ecb8a6c60857 -r 375710c4b917 devel/py-setuptools/files/manage-eggs.py
--- a/devel/py-setuptools/files/manage-eggs.py  Thu Jul 04 06:25:23 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#!@PYTHON@
-
-import sys
-
-from setuptools.command.easy_install import PthDistributions
-from pkg_resources import find_distributions
-
-usage = "@PYPREFIX@-manage-eggs [ register | unregister ] egg\n"
-
-if len(sys.argv) != 3 or sys.argv[1] not in ("register", "unregister"):
-       sys.stderr.write(usage)
-       sys.exit(1)
-
-pth = PthDistributions("@PYSITELIB@/easy-install.pth")
-distrib = find_distributions(sys.argv[2], True).next()
-if sys.argv[1] == "register":
-       pth.add(distrib)
-elif sys.argv[1] == "unregister":
-       pth.remove(distrib)
-pth.save()
diff -r ecb8a6c60857 -r 375710c4b917 devel/py-setuptools/patches/patch-aa
--- a/devel/py-setuptools/patches/patch-aa      Thu Jul 04 06:25:23 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/09/07 14:22:39 joerg Exp $
-
---- setup.py.orig      2009-09-06 22:37:49.000000000 +0200
-+++ setup.py
-@@ -67,7 +67,6 @@ setup(
-         ],
- 
-         "console_scripts": [
--             "easy_install = setuptools.command.easy_install:main",
-              "easy_install-%s = setuptools.command.easy_install:main"



Home | Main Index | Thread Index | Old Index