Merge pull request #772 from ayhanyalcinsoy/master

python3-pip, ptyhon3-setuptools and pyqtermwidget5
This commit is contained in:
Ertuğrul Erata
2015-11-06 14:26:52 +02:00
12 changed files with 85558 additions and 84991 deletions
+85406 -84986
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
a487f7d9547c28acfc9e10ae3294b5781a8ccca2
9a9195feb4cf67190ab539fb9303b14ca4a28b01
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
abc1c90ea82e3ef7cc2fc3d49ff127cd8ac66256
0b6bafd8597ea992341ca2101acb38c473a58730
+15 -1
View File
@@ -5,6 +5,20 @@
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import pythonmodules
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
from pisi.actionsapi import pisitools
def install():
WorkDir="pip-%s" % get.srcVERSION()
def setup():
shelltools.makedirs("python3")
shelltools.copytree("../pip-%s" % get.srcVERSION(), "%s/python3" % get.workDIR())
pythonmodules.compile()
shelltools.cd("%s/python3" % get.workDIR())
pythonmodules.compile(pyVer = "3")
def install():
pythonmodules.install()
shelltools.cd("%s/python3" % get.workDIR())
pythonmodules.install(pyVer = "3")
pisitools.rename("/usr/bin/pip", "pip3")
+16 -1
View File
@@ -15,13 +15,15 @@
<BuildDependencies>
<Dependency>python-setuptools</Dependency>
<Dependency>python3-setuptools</Dependency>
<Dependency>python3-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>pip</Name>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/bin/pip2*</Path>
<Path fileType="data">/usr/lib/python2*</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
@@ -29,6 +31,19 @@
<Dependency>python-setuptools</Dependency>
</RuntimeDependencies>
</Package>
<Package>
<Name>pip3</Name>
<Files>
<Path fileType="executable">/usr/bin/pip</Path>
<Path fileType="executable">/usr/bin/pip3*</Path>
<Path fileType="data">/usr/lib/python3*</Path>
<!-- <Path fileType="doc">/usr/share/doc</Path> -->
</Files>
<RuntimeDependencies>
<Dependency>python-setuptools</Dependency>
</RuntimeDependencies>
</Package>
<History>
<Update release="2">
@@ -10,7 +10,8 @@ from pisi.actionsapi import get
def setup():
shelltools.cd("pyqt5")
pisitools.dosed("config.py", "/PyQt5","/Py2Qt5")
#pisitools.dosed("config.py", "/PyQt5","/Py2Qt5")
#pisitools.dosed("config.py", "config.sip_bin", "/usr/bin/py2sip")
shelltools.system("python config.py")
pisitools.dosed("Makefile", "^(CXXFLAGS.*)$", "\\1 -fpermissive")
pisitools.dosed("sipQTermWidgetQTermWidget.cpp", "sipCpp->setColorScheme\(a0\)", "sipCpp->setColorScheme(QString::number(a0))")
@@ -0,0 +1,13 @@
--- configy.py 2015-11-05 04:35:43.000000000 +0200
+++ pyqt5/config.py 2015-11-05 04:37:20.021862391 +0200
@@ -38,8 +38,8 @@
# Run SIP to generate the code. Note that we tell SIP where to find the qt
# module's specification files using the -I flag.
-os.system(" ".join([config.sip_bin, "-c", ".", "-b", build_file, "-I",
- config.default_sip_dir+"/PyQt5", qt_sip_flags, "qtermwidget.sip"]))
+os.system(" ".join(["/usr/bin/py2sip", "-c", ".", "-b", build_file, "-I",
+ config.default_sip_dir+"/Py2Qt5", qt_sip_flags, "qtermwidget.sip"]))
#pyqt_sip_dir yok config.pyqt_sip_dir
# We are going to install the SIP specification file for this module and
@@ -18,6 +18,9 @@
<Dependency>qtermwidget5-devel</Dependency>
</BuildDependencies>
<Archive sha1sum="5309a4270e797e7086746ee22e778e168db281e2" type="targz">https://github.com/hrngultekin/pyqtermwidget5/archive/pyqtermwidget5-v0.1.tar.gz</Archive>
<Patches>
<Patch>py2config.patch</Patch>
</Patches>
</Source>
<Package>
<Name>pyqtermwidget5</Name>
@@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import pythonmodules
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
from pisi.actionsapi import shelltools
WorkDir="distribute-%s" % get.srcVERSION()
def setup():
shelltools.makedirs("python3")
shelltools.copytree("../distribute-%s" % get.srcVERSION(), "%s/python3" % get.workDIR())
def install():
#pythonmodules.install()
#pisitools.remove("/usr/lib/%s/site-packages/setuptools/*.exe" % get.curPYTHON())
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")
#avoid python-setuptools conflict
pisitools.removeDir("/usr/share")
@@ -0,0 +1,68 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM 'http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd'>
<PISI>
<Source>
<Name>python-setuptools</Name>
<Homepage>http://pypi.python.org/pypi/setuptools</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>PSF-2.2</License>
<IsA>library</IsA>
<Summary>Python setuptools</Summary>
<Description>python-setuptools is a collection of enhancements to the Python distutils that allow you to more easily build and distribute Python packages, especially ones that have dependencies on other packages.</Description>
<Archive sha1sum="a62cfe21bd0e5e2913c5b576f872ca293b9bebca" type="targz">http://pypi.python.org/packages/source/d/distribute/distribute-0.6.49.tar.gz</Archive>
<BuildDependencies>
<Dependency>python3-devel</Dependency>
</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>
<Path fileType="executable">/usr/bin/py3easy-install</Path>
<Path fileType="executable">/usr/bin/easy_install-3*</Path>
<Path fileType="library">/usr/lib/python3*</Path>
</Files>
</Package>
<History>
<Update release="4">
<Date>2014-05-11</Date>
<Version>0.6.49</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-07-24</Date>
<Version>0.6.49</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-02-17</Date>
<Version>0.6.35</Version>
<Comment>Version bump</Comment>
<Name>Ertan Güven</Name>
<Email>ertan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-08-19</Date>
<Version>0.6.28</Version>
<Comment>First release</Comment>
<Name>Ramazan Utku</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>python-setuptools</Name>
<Summary xml:lang="tr">Python kurulum araçları</Summary>
<Description xml:lang="tr">python-setuptools, Python distutils'e yapılan, özellikle başka paketlere bağımlılığı olan Python paketlerini daha kolay oluşturmaya ve dağıtmaya yarayan iyileştirmeler koleksiyonudur.</Description>
</Source>
</PISI>