From 257360f25d370b94e3ab24d0c155e052a139b5a8 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Aug 07 2018 12:10:12 +0000 Subject: Drop rpm-py-installer from requires rpm-py-installer is removed from requires. Add a new section to documentation for how to install rpkg, which mentions to install rpm-py-installer with rpkg together. For running tests, rpm-py-installer is added to deps option. Fixes #357 Signed-off-by: Chenxiong Qi --- diff --git a/README.rst b/README.rst index 8eaae0e..afd1219 100644 --- a/README.rst +++ b/README.rst @@ -14,6 +14,49 @@ Unless otherwise specified, all files are licensed under GPLv2+. There are parts of koji code in pyrpkg/cli, those parts are licensed under LGPLv2(.1). See COPYING-koji for that license statement. +Installation +============ + +Install from distribution packages +---------------------------------- + +rpkg is available in Fedora and EPEL repositories. It can be installed with +package manager command. There are Python 2 and 3 package for Fedora and only +Python 2 package in EPEL. + +Install in a Fedora system:: + + sudo dnf install python2-rpkg + +If Python 3 package is needed, install `python3-rpkg`. + +Install in EL6 or EL7:: + + sudo yum install python2-rpkg + +Install in a Python virtual environment +--------------------------------------- + +Both Python 2 and 3 packages are published in PyPI. Install rpkg in a Python 3 +virtual environment in these steps:: + + python3 -m venv env + source env/bin/activate + pip install rpkg rpm-py-installer + +You are free to create a virtual environment with option ``--system-site-packages``. + +Please note that, rpkg depends on some other utilities to build packages. These +packages are required to be installed as well. + +* ``mock``: for local mockbuild. +* ``rpm-build``: for local RPM build, which provides the command line ``rpm``. +* ``rpmlint``: check SPEC. +* ``copr-cli``: for building package in `Fedora Copr`_. +* ``module-build-service``: for building modules. + +.. _`Fedora Copr`: https://copr.fedorainfracloud.org/ + Contribution ============ diff --git a/requirements/pypi.txt b/requirements/pypi.txt index 3ab24b9..5d35f3b 100644 --- a/requirements/pypi.txt +++ b/requirements/pypi.txt @@ -7,8 +7,13 @@ GitPython koji >= 1.15 pycurl >= 7.19 requests -rpm-py-installer six >= 1.9.0 +# rpm-py-installer +# +# Or, install from rpm-py-installer internal installer +# https://github.com/junaruga/rpm-py-installer#install-directly-without-rpm-py-installer-package +# python -c "$(curl -fsSL https://raw.githubusercontent.com/junaruga/rpm-py-installer/master/install.py)" + # openidc-client # used for MBS OIDC authentication # requests-kerberos # used for MBS Kerberos authentication diff --git a/tox.ini b/tox.ini index e75e89b..e166486 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ envlist = py26,py27,py36,py37,flake8 [testenv] skip_install = True deps = + rpm-py-installer -r{toxinidir}/requirements/test-pypi.txt commands = nosetests {posargs}