Skip to content

Commit

Permalink
v4.2.12: use asp instead of abs/rsync
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Warrick <[email protected]>
  • Loading branch information
Kwpolska committed May 13, 2017
1 parent 2965379 commit c908a84
Show file tree
Hide file tree
Showing 69 changed files with 296 additions and 245 deletions.
4 changes: 2 additions & 2 deletions .pbwrapperhelp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ usage: pkgbuilder [-h] [-V] [-S] [-F] [--userfetch USER] [-i] [-s] [-u] [-U]
An AUR helper (and library) in Python 3.

positional arguments:
PACKAGE AUR/ABS packages to build
PACKAGE AUR/repository packages to build

optional arguments:
-h, --help show this help message and exit
Expand Down Expand Up @@ -97,4 +97,4 @@ configuration overrides:
--notmp don't build in /tmp
--build build (instead of fetching)

Also accepts ABS packages.
Also accepts repository packages to build from source.
9 changes: 7 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Appendix C. Changelog
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: CHANGELOG

Expand Down Expand Up @@ -47,6 +47,11 @@ More information can be found on GitHub in the `releases section <https://github
Version History
===============

4.2.12
* use asp instead of abs/rsync
* remove some references to ABS
* **deprecated** ``pkgbuilder.build.rsync`` — use ``pkgbuilder.build.asp_export`` instead.

4.2.11
* Report missing packages in -F properly (via Issue #52)

Expand Down
6 changes: 3 additions & 3 deletions PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Maintainer: Chris Warrick <[email protected]>
pkgname=pkgbuilder
_pyname=pkgbuilder
pkgver=4.2.11
pkgver=4.2.12
pkgrel=1
pkgdesc='A Python AUR helper/library.'
arch=('any')
url='https://github.com/Kwpolska/pkgbuilder'
license=('BSD')
depends=('python' 'python-setuptools' 'pyalpm>=0.5.1-1' 'python-requests' 'python-srcinfo' 'rsync' 'git')
depends=('python' 'python-setuptools' 'pyalpm>=0.5.1-1' 'python-requests' 'python-srcinfo' 'asp' 'git')
options=(!emptydirs)
source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
md5sums=('bd8b0ca1b89cd8b1331f39694c864d55')
md5sums=('5a6a74db9dd09fe79d3735fec1e4769f')

package() {
cd "${srcdir}/${_pyname}-${pkgver}"
Expand Down
4 changes: 2 additions & 2 deletions PKGBUILD-git
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
pkgname=pkgbuilder-git
_pyname=pkgbuilder
_gitname=pkgbuilder
pkgver=4.2.11
pkgver=4.2.12
pkgrel=1
pkgdesc='A Python AUR helper/library. (git version)'
arch=('any')
url='https://github.com/Kwpolska/pkgbuilder'
license=('BSD')
depends=('python' 'python-setuptools' 'pyalpm>=0.5.1-1' 'python-requests' 'python-srcinfo' 'rsync' 'git')
depends=('python' 'python-setuptools' 'pyalpm>=0.5.1-1' 'python-requests' 'python-srcinfo' 'asp' 'git')
makedepends=('git')
options=(!emptydirs)
provides=('pkgbuilder')
Expand Down
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ PKGBUILDer. An AUR helper (and library) in Python 3.
=====================================================
:Info: This is the README file for PKGBUILDer.
:Author: Chris Warrick <[email protected]>
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index: README

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ PKGBUILDer. An AUR helper (and library) in Python 3.
=====================================================
:Info: This is the README file for PKGBUILDer.
:Author: Chris Warrick <[email protected]>
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index: README
Expand Down
9 changes: 7 additions & 2 deletions docs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Appendix C. Changelog
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: CHANGELOG

Expand Down Expand Up @@ -47,6 +47,11 @@ More information can be found on GitHub in the `releases section <https://github
Version History
===============

4.2.12
* use asp instead of abs/rsync
* remove some references to ABS
* **deprecated** ``pkgbuilder.build.rsync`` — use ``pkgbuilder.build.asp_export`` instead.

4.2.11
* Report missing packages in -F properly (via Issue #52)

Expand Down
4 changes: 2 additions & 2 deletions docs/LICENSE.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Appendix B. License for PKGBUILDer
==================================
:Info: This is the license for PKGBUILDer.
:Author: Chris Warrick <[email protected]>
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: LICENSE

Expand Down
4 changes: 2 additions & 2 deletions docs/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ PKGBUILDer. An AUR helper (and library) in Python 3.
=====================================================
:Info: This is the README file for PKGBUILDer.
:Author: Chris Warrick <[email protected]>
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index: README
Expand Down
4 changes: 2 additions & 2 deletions docs/aur.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ aur module (AUR class)
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: AUR; RPC
.. index:: RPC
Expand Down
4 changes: 2 additions & 2 deletions docs/build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ build module
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: build
.. versionadded:: 2.1.0.0
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
version = '4.2.11'
version = '4.2.12'
# The full version, including alpha/beta/rc tags.
release = '4.2.11'
release = '4.2.12'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 2 additions & 2 deletions docs/exceptions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Exceptions in PKGBUILDer
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: Exceptions
.. versionadded:: 3.0.0
Expand Down
4 changes: 2 additions & 2 deletions docs/main.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ __main__ module
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: main
.. versionchanged:: 4.0.0
Expand Down
10 changes: 6 additions & 4 deletions docs/package.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package module (Package, AURPackage, ABSPackage classes)
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: Package
.. index:: AURPackage
Expand All @@ -17,6 +17,8 @@ Added in 3.0.0, the Package family of classes is the core of PKGBUILDer. They
are responsible for storing package data in a consistent way. All class
entries are Pythonic.

**Historic note:** whenever *ABS* is used, it means *repository package*. The ABS tool was deprecated in 2017 and replaced by ASP; however, PKGBUILDer uses that abbreviation to refer to packages that are in Arch repositories.

.. automodule:: pkgbuilder.package

.. autoclass:: pkgbuilder.package.Package
Expand All @@ -36,13 +38,13 @@ attributes:
+-------------------+--------+---------+---------------------------------------------------------------------------------------------+
| description | str | None | Package description. |
+-------------------+--------+---------+---------------------------------------------------------------------------------------------+
| repo | str | None | The repo (ABS) or category (AUR) of the package in question. |
| repo | str | None | The repo or category (AUR) of the package in question. |
+-------------------+--------+---------+---------------------------------------------------------------------------------------------+
| url | str | None | The upstream URL specified in the PKGBUILD. |
+-------------------+--------+---------+---------------------------------------------------------------------------------------------+
| licenses | list | [] | Licenses specified in the PKGBUILD. |
+-------------------+--------+---------+---------------------------------------------------------------------------------------------+
| human | str | None | The packager (ABS) or maintainer (AUR) of the package in question. |
| human | str | None | The packager (repo) or maintainer (AUR) of the package in question. |
+-------------------+--------+---------+---------------------------------------------------------------------------------------------+

.. autoclass:: pkgbuilder.package.AURPackage
Expand Down
Binary file modified docs/pb.8.gz
Binary file not shown.
6 changes: 3 additions & 3 deletions docs/pb.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ PBWrapper
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or Appendix B.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12
:Wrapper Version: 0.5.3
:Manual section: 8
:Manual group: PKGBUILDer manual
Expand Down Expand Up @@ -59,7 +59,7 @@ pb -S python hello
Installs the Python interpreter from the repos (which is already on
your system, especially if you have installed PKGBUILDer/PBWrapper)
and GNU Hello from the AUR. Note that, if you used ``pkgbuilder`` instead
of ``pb``, the Python package would be fetched from the ABS (instead of the
of ``pb``, the Python package would be fetched from ASP (instead of the
repositories) and built locally.

pb -Si python hello
Expand Down
4 changes: 2 additions & 2 deletions docs/pbds.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ pbds module (PBDS class)
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. module: pbds
Expand Down
Binary file modified docs/pkgbuilder.8.gz
Binary file not shown.
14 changes: 7 additions & 7 deletions docs/pkgbuilder.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ PKGBUILDer
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or Appendix B.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12
:Manual section: 8
:Manual group: PKGBUILDer manual

Expand All @@ -27,9 +27,9 @@ much as possible.
Since version 2.1.0.0, PKGBUILDer provides modules that can be used in
other scripts.

Since version 2.1.5.6, PKGBUILDer also provides support for ABS packages.
Passing an ABS package name to the ``-S`` option will result in a seamless
detection and build process.
Since version 2.1.5.6, PKGBUILDer also provides support for repository
packages. Passing a repository package name to the ``-S`` option will result
in a seamless detection and build process.

Notice: Running PKGBUILDer and/or PBWrapper as root can deal catastrophic
damage to your system. Run it as a regular user, you will be prompted for
Expand Down Expand Up @@ -149,8 +149,8 @@ pkgbuilder -SF hello
Like above, but does it in /tmp/pkgbuilder-UID.

pkgbuilder python
Python is a binary repo package, triggering a ABS download via rsync (no
need for ``extra/abs``). -S and/or -F are also accepted.
Python is a binary repo package, triggering a package download from ASP.
-S and/or -F are also accepted.

pkgbuilder -Syu
Check for updates and offer installing them.
Expand Down
4 changes: 2 additions & 2 deletions docs/sample-scripts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ PKGBUILDer Sample Scripts
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: sample scripts

Expand Down
4 changes: 2 additions & 2 deletions docs/transaction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Transactions
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: transaction
.. versionadded:: 4.1.0
Expand Down
4 changes: 2 additions & 2 deletions docs/ui.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ ui module (UI class)
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: UI
.. versionadded:: 3.0.0
Expand Down
4 changes: 2 additions & 2 deletions docs/upgrade.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ upgrade module
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: upgrade
.. index:: Syu
Expand Down
4 changes: 2 additions & 2 deletions docs/utils.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ utils module
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12

.. index:: utils
.. versionadded:: 2.1.0.0
Expand Down
4 changes: 2 additions & 2 deletions docs/wrapper.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ PBWrapper
:Author: Chris Warrick <[email protected]>
:Copyright: © 2011-2017, Chris Warrick.
:License: BSD (see /LICENSE or :doc:`Appendix B <LICENSE>`.)
:Date: 2017-05-02
:Version: 4.2.11
:Date: 2017-05-13
:Version: 4.2.12
:PBWrapper Version: 0.2.3

.. index:: wrapper
Expand Down
Binary file modified locale/ar/LC_MESSAGES/pkgbuilder.mo
Binary file not shown.
Loading

0 comments on commit c908a84

Please sign in to comment.