diff --git a/MANIFEST b/MANIFEST index 9984f4a..801482f 100644 --- a/MANIFEST +++ b/MANIFEST @@ -20,7 +20,6 @@ docs/_build/doctrees/pkgbuilder.doctree docs/html/.buildinfo docs/html/README.html docs/html/errorcodes.html -docs/html/genindex.html docs/html/index.html docs/html/objects.inv docs/html/pkgbuilder.html diff --git a/PKGBUILD b/PKGBUILD index de7b1d7..3cf44a2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kwpolska pkgname=pkgbuilder -pkgver=2.1.1 +pkgver=2.1.1.1 pkgrel=1 pkgdesc="A basic Python AUR helper/library." arch=('any') @@ -9,7 +9,7 @@ license=('BSD') depends=('python' 'pyalpm' 'python-pyparsing') options=(!emptydirs) source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('ccc0ffdd929b05ed7cc689d16ec06b04') +md5sums=('3eebaf12ba5fba95e2d31397dffd2b0f') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/README.rst b/README.rst index 3d41064..64a68c0 100644 --- a/README.rst +++ b/README.rst @@ -3,8 +3,8 @@ README for PKGBUILDer ===================== :Info: This is the README file for PKGBUILDer. :Author: Kwpolska -:Date: 2011-09-22 -:Version: 2.1.0.2 +:Date: 2011-09-23 +:Version: 2.1.1.1 PKGBUILDer. A Python AUR helper/library. ========================================= diff --git a/dist/pkgbuilder-2.1.1.1.tar.gz b/dist/pkgbuilder-2.1.1.1.tar.gz new file mode 100644 index 0000000..56aa347 Binary files /dev/null and b/dist/pkgbuilder-2.1.1.1.tar.gz differ diff --git a/docs/Makefile b/docs/Makefile index 7d56a82..6841720 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,5 +1,5 @@ # Makefile for Sphinx documentation -# +# modded by Kw # You can set these variables from the command line. SPHINXOPTS = @@ -41,6 +41,10 @@ html: @echo @echo "Build finished. The HTML pages are in ./html." +zip: + cd html/ + zip -r /tmp/docs.zip ./* + dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @echo diff --git a/docs/README.rst b/docs/README.rst deleted file mode 100644 index 1d75d01..0000000 --- a/docs/README.rst +++ /dev/null @@ -1,61 +0,0 @@ -===================== -README for PKGBUILDer -===================== -:Info: This is the README file for PKGBUILDer. -:Author: Kwpolska -:Date: 2011-09-22 -:Version: 2.1.1 - -PKGBUILDer. A Python AUR helper/library. -========================================= - -PURPOSE -------- -Building and installing AUR packages. - -INSTALLATION ------------- -Copy pkgbuilder.py to /usr/bin or ~/bin. You need to install -pyalpm from [extra] and python3-aur from the AUR. - -NOTES ------ -This is Version 2 of PKGBUILDer. The original Perl version is included, -but it shall not be used. - -Version 2.1 is a big leap forward. It introduces many new features. -It is now stable. It is now available as an AUR and PyPI package. - -The -S (DS.pacman) parameter adds pacman wrapper compatibility. - -For more info, refer to the pkgbuilder(8) man page or HTML docs in -docs/html. - -COPYRIGHT ---------- -Copyright (C) 2011, Kwpolska -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions, and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions, and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the author of this software nor the name of - contributors to this software may be used to endorse or promote products - derived from this software without specific prior written consent. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. diff --git a/docs/README.rst b/docs/README.rst new file mode 120000 index 0000000..89a0106 --- /dev/null +++ b/docs/README.rst @@ -0,0 +1 @@ +../README.rst \ No newline at end of file diff --git a/docs/conf.py b/docs/conf.py index 59a87e4..399193a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,7 +50,7 @@ # The short X.Y version. version = '2.1' # The full version, including alpha/beta/rc tags. -release = '2.1.1' +release = '2.1.1.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/errorcodes.rst b/docs/errorcodes.rst index 66b7e49..341d904 100644 --- a/docs/errorcodes.rst +++ b/docs/errorcodes.rst @@ -3,8 +3,8 @@ Appendix B. PKGBUILDer error messages list ========================================== :Info: This is an appendix to the PKGBUILDer documentation. :Author: Kwpolska -:Date: 2011-09-22 -:Version: 2.1.1 +:Date: 2011-09-23 +:Version: 2.1.1.1 In order to help debugging, error messages are numbered. Each error message number has four digits: the first one is the diff --git a/docs/html/README.html b/docs/html/README.html index fd9c7f6..cbe7fd2 100644 --- a/docs/html/README.html +++ b/docs/html/README.html @@ -172,7 +172,7 @@

Navigation

© Copyright 2011, Kwpolska. - Last updated on 2011-09-22T15:09:29Z. + Last updated on 2011-09-23T20:09:54Z. Created using Sphinx 1.0.7.
diff --git a/docs/html/_sources/README.txt b/docs/html/_sources/README.txt index 1d75d01..3d41064 100644 --- a/docs/html/_sources/README.txt +++ b/docs/html/_sources/README.txt @@ -4,7 +4,7 @@ README for PKGBUILDer :Info: This is the README file for PKGBUILDer. :Author: Kwpolska :Date: 2011-09-22 -:Version: 2.1.1 +:Version: 2.1.0.2 PKGBUILDer. A Python AUR helper/library. ========================================= diff --git a/docs/html/errorcodes.html b/docs/html/errorcodes.html index 8bdd0ae..0a75d8f 100644 --- a/docs/html/errorcodes.html +++ b/docs/html/errorcodes.html @@ -283,7 +283,7 @@

Navigation

© Copyright 2011, Kwpolska. - Last updated on 2011-09-22T15:09:29Z. + Last updated on 2011-09-23T20:09:54Z. Created using Sphinx 1.0.7.
diff --git a/docs/html/genindex.html b/docs/html/genindex.html deleted file mode 100644 index 7931989..0000000 --- a/docs/html/genindex.html +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - Index — PKGBUILDer v2.1.0 documentation - - - - - - - - - -
-

Navigation

- -
- -
-
-
-
- - -

Index

- -
- -
- - -
-
-
-
-
- - - - - -
-
-
-
-
-

Navigation

- -
-
- © Copyright 2011, Kwpolska. - Last updated on 2011-09-19T20:09:41Z. - Created using Sphinx 1.0.7. -
- - \ No newline at end of file diff --git a/docs/html/index.html b/docs/html/index.html index 7f88aea..34c2052 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -100,7 +100,7 @@

Navigation

© Copyright 2011, Kwpolska. - Last updated on 2011-09-22T16:09:02Z. + Last updated on 2011-09-23T20:09:54Z. Created using Sphinx 1.0.7.
diff --git a/docs/html/pkgbuilder.html b/docs/html/pkgbuilder.html index e856ee2..f8befb0 100644 --- a/docs/html/pkgbuilder.html +++ b/docs/html/pkgbuilder.html @@ -213,7 +213,7 @@

Navigation

© Copyright 2011, Kwpolska. - Last updated on 2011-09-22T16:09:02Z. + Last updated on 2011-09-23T20:09:54Z. Created using Sphinx 1.0.7.
diff --git a/docs/html/search.html b/docs/html/search.html index 77a269c..18ed1e4 100644 --- a/docs/html/search.html +++ b/docs/html/search.html @@ -84,7 +84,7 @@

Navigation

© Copyright 2011, Kwpolska. - Last updated on 2011-09-22T16:09:02Z. + Last updated on 2011-09-23T20:09:54Z. Created using Sphinx 1.0.7.
diff --git a/docs/html/searchindex.js b/docs/html/searchindex.js index bfcb81b..4f5b2ec 100644 --- a/docs/html/searchindex.js +++ b/docs/html/searchindex.js @@ -1 +1 @@ -Search.setIndex({objects:{},terms:{all:0,code:[0,2,3],queri:3,four:2,follow:[0,3],content:1,iconv:2,procur:0,depend:2,friendli:3,send:3,aur:[0,1,2,3],skip:3,aris:0,neglig:0,introduc:0,merchant:0,digit:2,sourc:0,string:2,util:2,exact:2,err:2,list:[0,1,2],pleas:2,impli:0,direct:0,maintain:[2,3],download:2,compat:[0,3],index:[],sub:2,section:3,calcul:2,current:3,version:[0,2,3],"new":0,order:2,"public":3,deriv:0,disclaim:0,met:0,modif:0,sinc:3,search:[2,3],prior:0,permit:0,extra:0,modul:[2,3],api:2,instal:[0,2,3],from:[0,2,3],proceed:2,visit:3,perl:0,usr:0,tell:2,more:[0,2,3],desir:2,notic:0,appendix:[1,2],indic:[],particular:0,must:0,pkgbuild:2,pyalpm:0,work:3,subel:2,can:3,purpos:0,root:2,process:3,accept:3,"00z":[],tarbal:2,occur:2,instead:3,updat:[2,3],product:0,after:2,befor:2,date:[0,2,3],data:0,man:0,"short":2,author:[0,2,3],element:2,caus:0,inform:2,bulit:2,juan:2,oper:3,help:2,softwar:0,consent:0,through:2,paramet:[0,3],conjunct:3,group:3,fit:0,makepkg:[2,3],tort:0,mail:3,non:2,good:0,"return":2,thei:3,python:[0,1,2,3],interrupt:0,now:[0,3],nor:[0,2],name:[0,3],auto_build:2,refresh:3,each:2,debug:2,found:[2,3],mean:2,domain:3,vote:3,redistribut:0,happen:2,extract:2,event:0,special:[0,3],out:[0,2,3],shown:2,profit:0,categori:[1,2,3],cwd:3,reason:2,theori:0,ask:2,"byte":2,place:3,retain:0,first:[2,3],origin:[0,3],endors:0,arrai:2,number:2,predepcheck:2,mai:0,instruct:2,wrapper:[0,3],wasn:2,owner:[0,3],stabl:0,script:[2,3],licens:3,system:2,messag:[1,2],too:2,illeg:2,option:3,copi:0,sync:3,github:3,holder:0,than:2,target:3,provid:[0,2,3],charact:2,posit:2,sai:3,ani:0,packag:[0,2,3],substitut:0,need:[0,2],issu:[2,3],built:3,note:0,also:[2,3],without:0,build:[0,2,3],advis:0,even:0,distribut:0,shall:[0,3],multipli:2,letter:2,phase:3,"class":2,url:3,doc:0,request:2,doe:2,syntax:3,find:2,copyright:[0,3],explain:2,busi:0,hit:2,variou:3,get:2,express:0,pypi:0,repo:3,cannot:2,report:3,liabl:0,requir:2,bad:2,see:3,result:2,reserv:0,someth:2,written:0,pkgbuilder:[0,1,2,3],neither:0,incident:0,last:3,howev:[0,2],contract:0,mani:0,com:3,comment:2,kwpolska:[0,2,3],color:3,exemplari:0,damag:0,liabil:0,addition:3,three:2,been:3,compon:2,much:3,basic:[],consequenti:0,piconv:2,togeth:2,plain:2,servic:0,"while":2,abov:[0,2],error:[1,2],helper:[0,1,3],tabl:[],readm:[0,1],them:3,synopsi:3,incorrectli:2,perform:2,make:3,shorter:2,binari:0,html:0,decod:2,document:[0,1,2,3],http:3,depcheck:2,user:3,syu:3,techniqu:3,exampl:[2,3],thi:[0,2,3],usual:2,identifi:2,"01t00":[],add:[0,2],valid:[2,3],input:2,match:2,bin:0,applic:3,which:[2,3],format:3,read:2,big:0,password:2,python3:0,loss:0,specif:0,makedepend:2,manual:3,nocolor:3,output:2,page:[0,3],right:[0,2],indirect:0,librari:[0,1,3],tmp:3,leap:0,exit:2,iso:[],condit:0,reproduc:0,thhe:3,refer:[0,2],usag:2,broken:2,promot:0,repositori:2,about:[2,3],materi:0,submitt:2,encod:2,automat:[2,3],warranti:0,contributor:0,your:2,git:3,wai:0,submit:3,avail:0,strict:0,includ:[0,2],forward:0,properli:2,form:0,offer:3,forc:3,bug:3,info:[0,2,3],utf:2,possibl:[0,2,3],whether:0,pacman:[0,2,3],displai:[2,3],limit:0,otherwis:0,problem:2,featur:0,uid:3,dure:2,exist:2,file:[0,2],check:[2,3],when:2,field:2,other:[0,2,3],sysupgrad:3,you:[0,2,3],novalid:3,sequenc:2,ansi:3,dropbox:3,outdat:2,directori:3,descript:3,ignor:[2,3],time:2,unicodedecodeerror:2},objtypes:{},titles:["README for PKGBUILDer","PKGBUILDer 2.1.1 documentation","Appendix B. PKGBUILDer error messages list","PKGBUILDer"],objnames:{},filenames:["README","index","errorcodes","pkgbuilder"]}) \ No newline at end of file +Search.setIndex({objects:{},terms:{origin:[0,3],all:0,code:[0,2,3],identifi:2,help:2,softwar:0,consent:0,particular:0,syntax:3,four:2,report:3,through:2,follow:[0,3],find:2,paramet:[0,3],content:1,iconv:2,procur:0,depend:2,copyright:[0,3],also:[2,3],explain:2,wai:0,specif:0,send:3,makepkg:[2,3],tort:0,add:[0,2],aur:[0,1,2,3],python3:0,queri:3,mail:3,match:2,neglig:0,modul:[2,3],introduc:0,build:[0,2,3],bin:0,applic:3,digit:2,sourc:0,"return":2,string:2,variou:3,get:2,python:[0,1,2,3],big:0,express:0,pypi:0,number:2,util:2,cannot:2,usr:0,"new":0,interrupt:0,liabl:0,now:[0,3],exact:2,nor:[0,2],loss:0,name:[0,3],makedepend:2,good:0,manual:3,nocolor:3,refresh:3,"public":3,provid:[0,2,3],bad:2,sinc:3,each:2,debug:2,output:2,page:[0,3],mean:2,pleas:2,impli:0,right:[0,2],"short":2,list:[0,1,2],input:2,direct:0,read:2,vote:3,redistribut:0,result:2,pkgbuild:2,stabl:0,download:2,reserv:0,indirect:0,extract:2,event:0,librari:[0,1,3],out:[0,2,3],compat:[0,3],shown:2,sub:2,busi:0,profit:0,someth:2,calcul:2,categori:[1,2,3],written:0,version:[0,2,3],exit:2,pkgbuilder:[0,1,2,3],depcheck:2,without:0,condit:0,neither:0,order:2,reproduc:0,cwd:3,refer:[0,2],check:[2,3],deriv:0,found:[2,3],even:0,usag:2,conjunct:3,disclaim:0,met:0,incident:0,modif:0,promot:0,repositori:2,leap:0,ask:2,group:3,"byte":2,valid:[2,3],juan:2,thhe:3,about:[2,3],purpos:0,last:3,fit:0,broken:2,materi:0,current:3,reason:2,contract:0,prior:0,place:3,pacman:[0,2,3],permit:0,non:2,retain:0,special:[0,3],com:3,other:[0,2,3],theori:0,comment:2,endors:0,kwpolska:[0,2,3],note:0,letter:2,extra:0,color:3,arrai:2,submitt:2,encod:2,domain:3,automat:[2,3],predepcheck:2,warranti:0,date:[0,2,3],instruct:2,api:2,exemplari:0,submit:3,wasn:2,owner:[0,3],instal:[0,2,3],html:0,your:2,damag:0,liabil:0,git:3,from:[0,2,3],proceed:2,messag:[1,2],script:[2,3],addition:3,licens:3,visit:3,system:2,been:3,perl:0,avail:0,strict:0,much:3,too:2,accept:3,illeg:2,man:0,tell:2,includ:[0,2],wrapper:[0,3],desir:2,option:3,form:0,offer:3,forc:3,copi:0,thei:3,search:[2,3],notic:0,bulit:2,forward:0,appendix:[1,2],skip:3,togeth:2,aris:0,sync:3,holder:0,than:2,pyalpm:0,must:0,info:[0,2,3],utf:2,target:3,err:2,possibl:[0,2,3],whether:0,plain:2,servic:0,work:3,subel:2,displai:[2,3],can:3,charact:2,directori:3,"while":2,limit:0,three:2,abov:[0,2],error:[1,2],posit:2,otherwis:0,problem:2,more:[0,2,3],root:2,howev:[0,2],merchant:0,sai:3,featur:0,uid:3,helper:[0,1,3],process:3,request:2,dure:2,readm:[0,1],ani:0,contributor:0,compon:2,packag:[0,2,3],properli:2,exist:2,file:[0,2],substitut:0,need:[0,2],hit:2,element:2,happen:2,oper:3,caus:0,tarbal:2,incorrectli:2,mai:0,built:3,auto_build:2,perform:2,synopsi:3,make:3,format:3,when:2,occur:2,shorter:2,field:2,maintain:[2,3],decod:2,sysupgrad:3,which:[2,3],advis:0,instead:3,you:[0,2,3],document:[0,1,2,3],novalid:3,updat:[2,3],tmp:3,product:0,http:3,distribut:0,see:3,shall:[0,3],multipli:2,sequenc:2,after:2,them:3,consequenti:0,friendli:3,befor:2,user:3,syu:3,mani:0,phase:3,dropbox:3,data:0,"class":2,techniqu:3,requir:2,outdat:2,github:3,binari:0,bug:3,piconv:2,url:3,doc:0,author:[0,2,3],descript:3,repo:3,doe:2,issu:[2,3],inform:2,password:2,exampl:[2,3],ignor:[2,3],thi:[0,2,3],time:2,unicodedecodeerror:2,first:[2,3],section:3,ansi:3,usual:2},objtypes:{},titles:["README for PKGBUILDer","PKGBUILDer 2.1.1 documentation","Appendix B. PKGBUILDer error messages list","PKGBUILDer"],objnames:{},filenames:["README","index","errorcodes","pkgbuilder"]}) \ No newline at end of file diff --git a/docs/index.rst b/docs/index.rst index 32b2333..93edb68 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,7 +3,7 @@ You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -PKGBUILDer 2.1.1 documentation +PKGBUILDer 2.1.1.1 documentation ================================ Contents: diff --git a/docs/pkgbuilder.rst b/docs/pkgbuilder.rst index a92d9ef..c3ef2c2 100644 --- a/docs/pkgbuilder.rst +++ b/docs/pkgbuilder.rst @@ -8,8 +8,8 @@ a Python AUR helper/library :Author: Kwpolska :Copyright: This document has been placed in the public domain. -:Date: 2011-09-22 -:Version: 2.1.1 +:Date: 2011-09-23 +:Version: 2.1.1.1 :Manual section: 8 :Manual group: PKGBUILDer manual diff --git a/pkgbuilder.py b/pkgbuilder.py index a12a08d..2332bd8 100755 --- a/pkgbuilder.py +++ b/pkgbuilder.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# PKGBUILDer Version 2.1.1 +# PKGBUILDer Version 2.1.1.1 # A Python AUR helper/library. # Copyright Kwpolska 2011. Licensed under GPLv3. # USAGE: ./build.py pkg1 [pkg2] [pkg3] (and more) @@ -18,7 +18,7 @@ import subprocess import datetime -VERSION = '2.1.1' +VERSION = '2.1.1.1' ### PBDS PB global data storage ### class PBDS: @@ -344,9 +344,9 @@ def prepare_deps(self, pkgbuild): bmdepends = [] makedepends = [] if bashdepends != []: - depends = [ s.rstrip()[1:-1] for s in bashdepends[0][1:-1] ] + depends = [ s.rstrip() for s in bashdepends[0][1:-1] ] if bmdepends != []: - makedepends = [ s.rstrip()[1:-1] for s in bmdepends[0][1:-1] ] + makedepends = [ s.rstrip() for s in bmdepends[0][1:-1] ] return depends + makedepends def depcheck(self, bothdepends): @@ -381,7 +381,7 @@ def depcheck(self, bothdepends): repos = dict((db.name, db) for db in pyalpm.get_syncdbs()) if pkg != None: parseddeps[dep] = 0 - elif pycman.action_sync.find_sync_package(dep, repos): + elif pycman.action_sync.find_sync_package(dep, repos)[0]: parseddeps[dep] = 1 elif self.utils.info(dep): parseddeps[dep] = 2 @@ -415,7 +415,7 @@ def build_runner(self, package): fancy_msg('Downloading the tarball...') downloadbytes = self.download(pkginfo['URLPath'], filename) - kbytes = int(downloadbytes) / 1000 #`K' means thousand. + kbytes = int(downloadbytes) / 1000 fancy_msg2('{0} kB downloaded'.format(kbytes)) fancy_msg('Extracting...') diff --git a/scripts/pkgbuilder b/scripts/pkgbuilder index 1ec5e49..83faaa0 100755 --- a/scripts/pkgbuilder +++ b/scripts/pkgbuilder @@ -1,4 +1,4 @@ -#!/usr/bin/python3.2 +#!/usr/bin/env python3 """Run PKGBUILDer.""" import pkgbuilder pkgbuilder.main_routine() diff --git a/setup.py b/setup.py index 7afaeb8..13ad3bd 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup setup(name='pkgbuilder', - version='2.1.1', + version='2.1.1.1', description='An AUR helper (and library) in python3', author='Kwpolska', author_email='kwpolska@kwpolska.tk', @@ -25,7 +25,7 @@ ], py_modules=['pkgbuilder'], scripts=['scripts/pkgbuilder'], - data_files=[#('bin', ['bin/pkgbuilder']), + data_files=[ ('share/man/man8', ['docs/pkgbuilder.8.gz']) ] )