Merge branch 'master' of github.com:pisilinux/main
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
<Summary>The PyPA recommended tool for installing Python packages</Summary>
|
||||
<Description>The PyPA recommended tool for installing Python packages</Description>
|
||||
<License>MIT</License>
|
||||
<Archive sha1sum="6c6076664a51ac14849696df65ace8d44e42dea7" type="targz">https://pypi.python.org/packages/source/p/pip/pip-8.1.1.tar.gz</Archive>
|
||||
<Archive sha1sum="910e2dd5c533d351a7dc84bc9091893659afcbb0" type="targz">https://github.com/pypa/pip/archive/8.1.2.tar.gz</Archive>
|
||||
|
||||
<BuildDependencies>
|
||||
<Dependency>python-setuptools</Dependency>
|
||||
@@ -47,6 +47,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="2">
|
||||
<Date>2016-05-16</Date>
|
||||
<Version>8.1.2</Version>
|
||||
<Comment>version bump</Comment>
|
||||
<Name>Ayhan Yalçınsoy</Name>
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2016-04-28</Date>
|
||||
<Version>8.1.1</Version>
|
||||
@@ -55,4 +62,4 @@
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
</PISI>
|
||||
|
||||
@@ -14,12 +14,9 @@ def setup():
|
||||
shelltools.makedirs("python3")
|
||||
shelltools.copytree("../setuptools-%s" % get.srcVERSION(), "%s/python3" % get.workDIR())
|
||||
|
||||
def install():
|
||||
#pythonmodules.install()
|
||||
#pisitools.remove("/usr/lib/%s/site-packages/setuptools/*.exe" % get.curPYTHON())
|
||||
def install():
|
||||
shelltools.cd("%s/python3" % get.workDIR())
|
||||
pythonmodules.install(pyVer = "3")
|
||||
#pisitools.remove("/usr/lib/python3.4/site-packages/setuptools/*.exe")
|
||||
pisitools.rename("/usr/bin/easy_install", "py3easy-install")
|
||||
#pisitools.rename("/usr/bin/easy_install", "py3easy-install")
|
||||
#avoid python-setuptools conflict
|
||||
pisitools.removeDir("/usr/share")
|
||||
pisitools.removeDir("/usr/share")
|
||||
|
||||
@@ -18,14 +18,6 @@
|
||||
</BuildDependencies>
|
||||
</Source>
|
||||
|
||||
<!--<Package>
|
||||
<Name>python-setuptools</Name>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin/easy_install-2.7</Path>
|
||||
<Path fileType="library">/usr/lib/python2*</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>-->
|
||||
<Package>
|
||||
<Name>python3-setuptools</Name>
|
||||
<Files>
|
||||
@@ -36,6 +28,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2016-05-16</Date>
|
||||
<Version>20.10.1</Version>
|
||||
<Comment>rebuild for python3 downgrade</Comment>
|
||||
<Name>Ayhan Yalçınsoy</Name>
|
||||
<Email>ayhanyalcinsoy@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2016-04-28</Date>
|
||||
<Version>20.10.1</Version>
|
||||
@@ -51,4 +50,4 @@
|
||||
<Email>marcin@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
</PISI>
|
||||
|
||||
Reference in New Issue
Block a user