Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Nov 2013 19:00:37 GMT
From:      William Grzybowski <wg@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/183726: [exp-run] replace py-distribute with py-setuptools
Message-ID:  <201311061900.rA6J0bRW047574@freefall.freebsd.org>
Resent-Message-ID: <201311061910.rA6JA08x048261@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         183726
>Category:       ports
>Synopsis:       [exp-run] replace py-distribute with py-setuptools
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 06 19:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     William Grzybowski
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r251226: Sat Jun 1 21:56:43 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64

>Description:

	py-setuptools is again the main project.
	I've sent an email asking for testers but got no response, so I would like to evaluate possible regressions with the switch.
	Let me know if you think it is not worth it.

	Thanks!

>How-To-Repeat:

>Fix:

	See attached patch, or alternatively find it here: http://people.freebsd.org/~wg/setuptools.txt


--- setuptools.txt begins here ---
Index: UPDATING
===================================================================
--- UPDATING	(revision 333021)
+++ UPDATING	(working copy)
@@ -5,6 +5,21 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20131106:
+  AFFECTS: users of devel/py-distribute (i.e you)
+  AUTHOR: wg@FreeBSD.org
+
+  devel/py-distribute was replaced with devel/py-setuptools. Please do
+  the following according to package manager used. py-distribute port
+  will be removed shortly.
+
+  # portmaster -o devel/py-setuptools devel/py-distribute
+    or
+  # portupgrade -fo devel/py-setuptools devel/py-distribute
+    or
+  # pkg set -o devel/py-distribute:devel/py-setuptools
+  # pkg install -f devel/py-setuptools
+
 20131103:
   AFFECTS: users of security/libtasn1 and any port that depends on it
   AUTHOR: novel@FreeBSD.org
Index: MOVED
===================================================================
--- MOVED	(revision 333021)
+++ MOVED	(working copy)
@@ -5169,3 +5169,4 @@
 textproc/gtkdiff||2013-11-05|Has expired: Gnome1 EOLed by upstream for a while.
 net-p2p/libtorrent-rasterbar-16|net-p2p/libtorrent-rasterbar|2013-11-06|Moved to net-p2p/libtorrent-rasterbar since it's a stable version
 net-p2p/libtorrent-rasterbar-python-16|net-p2p/libtorrent-rasterbar-python|2013-11-06|Moved to net-p2p/libtorrent-rasterbar-python since it's a stable version
+devel/py-distribute|devel/py-setuptools|2013-11-06|Replaced with setuptools
Index: Mk/bsd.python.mk
===================================================================
--- Mk/bsd.python.mk	(revision 332703)
+++ Mk/bsd.python.mk	(working copy)
@@ -442,8 +442,8 @@
 
 # setuptools support
 .if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install"
-BUILD_DEPENDS+=		${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-distribute
-RUN_DEPENDS+=		${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-distribute
+BUILD_DEPENDS+=		${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
+RUN_DEPENDS+=		${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
 
 PYDISTUTILS_BUILD_TARGET?=		bdist_egg
 PYDISTUTILS_INSTALL_TARGET?=	easy_install
Index: devel/Makefile
===================================================================
--- devel/Makefile	(revision 333021)
+++ devel/Makefile	(working copy)
@@ -3737,6 +3737,7 @@
     SUBDIR += py-sdl2
     SUBDIR += py-serpent
     SUBDIR += py-setproctitle
+    SUBDIR += py-setuptools
     SUBDIR += py-setuptools-git
     SUBDIR += py-setuptools_darcs
     SUBDIR += py-setuptools_hg
Index: devel/py-setuptools/Makefile
===================================================================
--- devel/py-setuptools/Makefile	(revision 0)
+++ devel/py-setuptools/Makefile	(working copy)
@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+PORTNAME=	setuptools
+PORTVERSION=	1.1.7
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR=	python
+
+MAINTAINER=	python@FreeBSD.org
+COMMENT=	Python packages installer
+
+LICENSE=	PSFL
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}distribute-[0-9]*
+
+PLIST_SUB=	PYVER=${PYTHON_VER} VERSION=${PORTVERSION}
+
+PYDISTUTILS_NOEGGINFO=	yes
+USE_PYTHON=	yes
+USE_PYDISTUTILS=yes
+
+SUB_LIST=	IF_DEFAULT=${IF_DEFAULT}
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} && !exists(${LOCALBASE}/bin/easy_install)
+PLIST_SUB+=	IF_DEFAULT=""
+.else
+PLIST_SUB+=	IF_DEFAULT="@comment "
+SUB_FILES+=	pkg-message
+.endif
+
+regression-test: build
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+
+.include <bsd.port.post.mk>

Property changes on: devel/py-setuptools/Makefile
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: devel/py-setuptools/distinfo
===================================================================
--- devel/py-setuptools/distinfo	(revision 0)
+++ devel/py-setuptools/distinfo	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (python/setuptools-1.1.7.tar.gz) = b35e3d7c79cfdb5b38cfc71f4b0deab4350c1176fc4bb05bfa8945504ecfb028
+SIZE (python/setuptools-1.1.7.tar.gz) = 682308

Property changes on: devel/py-setuptools/distinfo
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: devel/py-setuptools/files/pkg-message.in
===================================================================
--- devel/py-setuptools/files/pkg-message.in	(revision 0)
+++ devel/py-setuptools/files/pkg-message.in	(working copy)
@@ -0,0 +1,7 @@
+*********************************************************************
+
+    The script %%PREFIX%%/bin/easy_install was already installed
+    on your system, so the only script %%PREFIX%%/bin/easy_install-%%PYVER%%
+    has been added.
+
+*********************************************************************

Property changes on: devel/py-setuptools/files/pkg-message.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: devel/py-setuptools/pkg-descr
===================================================================
--- devel/py-setuptools/pkg-descr	(revision 0)
+++ devel/py-setuptools/pkg-descr	(working copy)
@@ -0,0 +1,10 @@
+Setuptools is a fully-featured, actively-maintained, and stable library
+designed to facilitate packaging Python projects, where packaging includes:
+ - Python package and module definitions
+ - Distribution package metadata
+ - Test hooks
+ - Project installation
+ - Platform-specific details
+ - Python 3 support
+
+WWW: https://pypi.python.org/pypi/setuptools

Property changes on: devel/py-setuptools/pkg-descr
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: devel/py-setuptools/pkg-plist
===================================================================
--- devel/py-setuptools/pkg-plist	(revision 0)
+++ devel/py-setuptools/pkg-plist	(working copy)
@@ -0,0 +1,147 @@
+%%IF_DEFAULT%%bin/easy_install
+bin/easy_install-%%PYVER%%
+%%PYTHON_SITELIBDIR%%/_markerlib/__init__.py
+%%PYTHON_SITELIBDIR%%/_markerlib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/_markerlib/markers.py
+%%PYTHON_SITELIBDIR%%/_markerlib/markers.pyc
+%%PYTHON_SITELIBDIR%%/easy_install.py
+%%PYTHON_SITELIBDIR%%/easy_install.pyc
+%%PYTHON_SITELIBDIR%%/pkg_resources.py
+%%PYTHON_SITELIBDIR%%/pkg_resources.pyc
+%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/entry_points.txt
+%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/entry_points.txt.orig
+%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/requires.txt
+%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/top_level.txt
+%%PYTHON_SITELIBDIR%%/setuptools-%%VERSION%%-py%%PYVER%%.egg-info/zip-safe
+%%PYTHON_SITELIBDIR%%/setuptools/__init__.py
+%%PYTHON_SITELIBDIR%%/setuptools/__init__.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/_backport/__init__.py
+%%PYTHON_SITELIBDIR%%/setuptools/_backport/__init__.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/__init__.py
+%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha.py
+%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha256.py
+%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha256.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha512.py
+%%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib/_sha512.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/archive_util.py
+%%PYTHON_SITELIBDIR%%/setuptools/archive_util.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/__init__.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/__init__.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/alias.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/alias.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_egg.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_egg.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_rpm.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_rpm.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_wininst.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/bdist_wininst.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/build_ext.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/build_ext.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/build_py.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/build_py.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/develop.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/develop.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/easy_install.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/easy_install.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/egg_info.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/egg_info.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/install.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/install.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/install_egg_info.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/install_egg_info.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/install_lib.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/install_lib.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/install_scripts.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/install_scripts.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/register.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/register.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/rotate.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/rotate.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/saveopts.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/saveopts.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/sdist.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/sdist.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/setopt.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/setopt.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/test.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/test.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/upload.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/upload.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/command/upload_docs.py
+%%PYTHON_SITELIBDIR%%/setuptools/command/upload_docs.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/compat.py
+%%PYTHON_SITELIBDIR%%/setuptools/compat.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/depends.py
+%%PYTHON_SITELIBDIR%%/setuptools/depends.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/dist.py
+%%PYTHON_SITELIBDIR%%/setuptools/dist.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/extension.py
+%%PYTHON_SITELIBDIR%%/setuptools/extension.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/package_index.py
+%%PYTHON_SITELIBDIR%%/setuptools/package_index.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/py24compat.py
+%%PYTHON_SITELIBDIR%%/setuptools/py24compat.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/py26compat.py
+%%PYTHON_SITELIBDIR%%/setuptools/py26compat.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/py27compat.py
+%%PYTHON_SITELIBDIR%%/setuptools/py27compat.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/sandbox.py
+%%PYTHON_SITELIBDIR%%/setuptools/sandbox.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/script template (dev).py
+%%PYTHON_SITELIBDIR%%/setuptools/script template (dev).pyc
+%%PYTHON_SITELIBDIR%%/setuptools/script template.py
+%%PYTHON_SITELIBDIR%%/setuptools/script template.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/site-patch.py
+%%PYTHON_SITELIBDIR%%/setuptools/site-patch.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/ssl_support.py
+%%PYTHON_SITELIBDIR%%/setuptools/ssl_support.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/doctest.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/doctest.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/py26compat.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/py26compat.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/script-with-bom.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/script-with-bom.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/server.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/server.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_bdist_egg.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_bdist_egg.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_build_ext.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_build_ext.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_develop.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_develop.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_dist_info.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_dist_info.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_easy_install.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_easy_install.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_egg_info.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_egg_info.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_markerlib.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_markerlib.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_packageindex.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_packageindex.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_resources.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_resources.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_sandbox.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_sandbox.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_sdist.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_sdist.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_test.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_test.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_upload_docs.py
+%%PYTHON_SITELIBDIR%%/setuptools/tests/test_upload_docs.pyc
+%%PYTHON_SITELIBDIR%%/setuptools/version.py
+%%PYTHON_SITELIBDIR%%/setuptools/version.pyc
+@dirrmtry %%PYTHON_SITELIBDIR%%/setuptools/tests
+@dirrmtry %%PYTHON_SITELIBDIR%%/setuptools/command
+@dirrmtry %%PYTHON_SITELIBDIR%%/setuptools/_backport/hashlib
+@dirrmtry %%PYTHON_SITELIBDIR%%/setuptools/_backport
+@dirrmtry %%PYTHON_SITELIBDIR%%/setuptools
+@dirrmtry %%PYTHON_SITELIBDIR%%/_markerlib
+@dirrmtry %%PYTHON_SITELIBDIR%%

Property changes on: devel/py-setuptools/pkg-plist
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- setuptools.txt ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311061900.rA6J0bRW047574>