From 6931b10b8e111f08107a39ab6a859132a0bfc420 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 12 Aug 2018 14:24:04 +0200 Subject: [PATCH] Add gertty and more of its python dependencies. Unfortunately it does not manage to connect to Haiku server. Works ok with OpenOCD's one. --- dev-python/gitdb/gitdb-0.6.4.recipe | 59 +++++ dev-python/gitpython/gitpython-2.1.11.recipe | 60 +++++ dev-python/pbr/pbr-4.2.0.recipe | 65 +++++ dev-python/ply/ply-3.11.recipe | 68 +++++ dev-python/pypandoc/pypandoc-1.4.recipe | 59 +++++ dev-python/smmap/smmap-0.9.0.recipe | 67 +++++ .../voluptuous/voluptuous-0.11.5.recipe | 66 +++++ dev-util/gertty/gertty-1.5.0.recipe | 75 ++++++ dev-util/gertty/patches/gertty-1.5.0.patchset | 250 ++++++++++++++++++ 9 files changed, 769 insertions(+) create mode 100644 dev-python/gitdb/gitdb-0.6.4.recipe create mode 100644 dev-python/gitpython/gitpython-2.1.11.recipe create mode 100644 dev-python/pbr/pbr-4.2.0.recipe create mode 100644 dev-python/ply/ply-3.11.recipe create mode 100644 dev-python/pypandoc/pypandoc-1.4.recipe create mode 100644 dev-python/smmap/smmap-0.9.0.recipe create mode 100644 dev-python/voluptuous/voluptuous-0.11.5.recipe create mode 100644 dev-util/gertty/gertty-1.5.0.recipe create mode 100644 dev-util/gertty/patches/gertty-1.5.0.patchset diff --git a/dev-python/gitdb/gitdb-0.6.4.recipe b/dev-python/gitdb/gitdb-0.6.4.recipe new file mode 100644 index 000000000..bdd580fb9 --- /dev/null +++ b/dev-python/gitdb/gitdb-0.6.4.recipe @@ -0,0 +1,59 @@ +SUMMARY="Git Object Database" +DESCRIPTION="Pure-Python git object database." +HOMEPAGE="https://pypi.org/project/gitdb/" +COPYRIGHT="2010-2015 Sebastian Thiel" +LICENSE="BSD (3-clause)" +REVISION="1" +SOURCE_URI="https://files.pythonhosted.org/packages/e3/95/7e5d7261feb46c0539ac5e451be340ddd64d78c5118f2d893b052c76fe8c/gitdb-$portVersion.tar.gz" +CHECKSUM_SHA256="a3ebbc27be035a2e874ed904df516e35f4a29a778a764385de09de9e0f139658" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python3) +PYTHON_VERSIONS=(3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} + diff --git a/dev-python/gitpython/gitpython-2.1.11.recipe b/dev-python/gitpython/gitpython-2.1.11.recipe new file mode 100644 index 000000000..3bd788bef --- /dev/null +++ b/dev-python/gitpython/gitpython-2.1.11.recipe @@ -0,0 +1,60 @@ +SUMMARY="Python Git Library" +DESCRIPTION="Python library used to interact with Git repositories." +HOMEPAGE="https://pypi.org/project/GitPython/" +COPYRIGHT="2010-2018 Sebastian Thiel, Michael Trier" +LICENSE="BSD (3-clause)" +REVISION="1" +SOURCE_URI="https://files.pythonhosted.org/packages/4d/e8/98e06d3bc954e3c5b34e2a579ddf26255e762d21eb24fede458eff654c51/GitPython-2.1.11.tar.gz" +SOURCE_DIR="GitPython-$portVersion" +CHECKSUM_SHA256="8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python3) +PYTHON_VERSIONS=(3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} + diff --git a/dev-python/pbr/pbr-4.2.0.recipe b/dev-python/pbr/pbr-4.2.0.recipe new file mode 100644 index 000000000..c269437d0 --- /dev/null +++ b/dev-python/pbr/pbr-4.2.0.recipe @@ -0,0 +1,65 @@ +SUMMARY="Python Build Reasonableness" +DESCRIPTION="PBR is a library that injects some useful and sensible default \ +behaviors into your setuptools run. + +PBR is only mildly configurable. The basic idea is that there’s a decent way \ +to run things and if you do, you should reap the rewards, because then it’s \ +simple and repeatable." +HOMEPAGE="https://pypi.org/project/pbr/" +COPYRIGHT="2013-2018 OpenStack Contributors" +LICENSE="Apache v2" +REVISION="1" +SOURCE_URI="https://files.pythonhosted.org/packages/c8/c3/935b102539529ea9e6dcf3e8b899583095a018b09f29855ab754a2012513/pbr-$portVersion.tar.gz" +CHECKSUM_SHA256="1b8be50d938c9bb75d0eaf7eda111eec1bf6dc88a62a6412e33bf077457e0f45" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + cmd:pbr + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python3) +PYTHON_VERSIONS=(3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} + diff --git a/dev-python/ply/ply-3.11.recipe b/dev-python/ply/ply-3.11.recipe new file mode 100644 index 000000000..8b8e131cf --- /dev/null +++ b/dev-python/ply/ply-3.11.recipe @@ -0,0 +1,68 @@ +SUMMARY="Python Lex & Yacc" +DESCRIPTION="PLY is yet another implementation of lex and yacc for Python. \ +Some notable features include the fact that its implemented entirely in \ +Python and it uses LALR(1) parsing which is efficient and well suited for \ +larger grammars. + +PLY provides most of the standard lex/yacc features including support for \ +empty productions, precedence rules, error recovery, and support for \ +ambiguous grammars. + +PLY is extremely easy to use and provides very extensive error checking." +HOMEPAGE="https://pypi.org/project/ply/" +COPYRIGHT="2006-2018 David Beazley" +LICENSE="BSD (3-clause)" +REVISION="1" +SOURCE_URI="https://files.pythonhosted.org/packages/e5/69/882ee5c9d017149285cab114ebeab373308ef0f874fcdac9beb90e0ac4da/ply-$portVersion.tar.gz" +CHECKSUM_SHA256="00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python3) +PYTHON_VERSIONS=(3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} + diff --git a/dev-python/pypandoc/pypandoc-1.4.recipe b/dev-python/pypandoc/pypandoc-1.4.recipe new file mode 100644 index 000000000..2649d8c99 --- /dev/null +++ b/dev-python/pypandoc/pypandoc-1.4.recipe @@ -0,0 +1,59 @@ +SUMMARY="Thin wrapper for pandoc" +DESCRIPTION="thin wrapper for pandoc, a universal document converter" +HOMEPAGE="https://pypi.org/project/pypandoc/" +COPYRIGHT="2011-2017 Juho Vepsäläinen" +LICENSE="MIT" +REVISION="1" +SOURCE_URI="https://files.pythonhosted.org/packages/71/81/00184643e5a10a456b4118fc12c96780823adb8ed974eb2289f29703b29b/pypandoc-$portVersion.tar.gz" +CHECKSUM_SHA256="e914e6d5f84a76764887e4d909b09d63308725f0cbb5293872c2c92f07c11a5b" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python3) +PYTHON_VERSIONS=(3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} + diff --git a/dev-python/smmap/smmap-0.9.0.recipe b/dev-python/smmap/smmap-0.9.0.recipe new file mode 100644 index 000000000..9ac797c1c --- /dev/null +++ b/dev-python/smmap/smmap-0.9.0.recipe @@ -0,0 +1,67 @@ +SUMMARY="Pure git implementation of a sliding window memory map manager" +DESCRIPTION="When reading from many possibly large files in a fashion similar \ +to random access, it is usually the fastest and most efficient to use memory \ +maps. + +Although memory maps have many advantages, they represent a very limited \ +system resource as every map uses one file descriptor, whose amount is \ +limited per process. On 32 bit systems, the amount of memory you can have \ +mapped at a time is naturally limited to theoretical 4GB of memory, which may \ +not be enough for some applications." +HOMEPAGE="https://pypi.org/project/smmap/" +COPYRIGHT="2011-2015 Sebastian Thiel" +LICENSE="BSD (3-clause)" +REVISION="1" +SOURCE_URI="https://files.pythonhosted.org/packages/bc/aa/b744b3761fff1b10579df996a2d2e87f124ae07b8336e37edc89cc502f86/smmap-$portVersion.tar.gz" +CHECKSUM_SHA256="0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python3) +PYTHON_VERSIONS=(3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} + diff --git a/dev-python/voluptuous/voluptuous-0.11.5.recipe b/dev-python/voluptuous/voluptuous-0.11.5.recipe new file mode 100644 index 000000000..324d1dde8 --- /dev/null +++ b/dev-python/voluptuous/voluptuous-0.11.5.recipe @@ -0,0 +1,66 @@ +SUMMARY="Python data validation library" +DESCRIPTION="Python data validation library primarily intended for validating \ +data coming into Python as JSON, YAML, etc. + +It has three goals: + + 1. Simplicity. + 2. Support for complex data structures. + 3. Provide useful error messages." +HOMEPAGE="https://pypi.org/project/voluptuous/" +COPYRIGHT="2010-2018 Alec Thomas" +LICENSE="BSD (3-clause)" +REVISION="1" +SOURCE_URI="https://files.pythonhosted.org/packages/6e/5e/4e721e30cf175f9e11a5acccf4cd74898c32cae93580308ecd4cf7d2a454/voluptuous-$portVersion.tar.gz" +CHECKSUM_SHA256="567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python3) +PYTHON_VERSIONS=(3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +eval "PROVIDES_${pythonPackage}=\"\ + ${portName}_$pythonPackage = $portVersion\ + \"; \ +REQUIRES_$pythonPackage=\"\ + haiku\n\ + cmd:python$pythonVersion\ + \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + + packageEntries $pythonPackage \ + $prefix/lib/python* + done +} + diff --git a/dev-util/gertty/gertty-1.5.0.recipe b/dev-util/gertty/gertty-1.5.0.recipe new file mode 100644 index 000000000..075d7b69c --- /dev/null +++ b/dev-util/gertty/gertty-1.5.0.recipe @@ -0,0 +1,75 @@ +SUMMARY="Console interface to Gerrit Code Review" +DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review \ +system. + +As compared to the web interface, the main advantages are: +* Workflow: the interface is designed to support a workflow similar to reading \ +network news or mail. In particular, it is designed to deal with a large \ +number of review requests across a large number of projects. +* Offline Use: Gertty syncs information about changes in subscribed projects \ +to a local database and local git repos. All review operations are performed \ +against that database and then synced back to Gerrit. +* Speed: user actions modify locally cached content and need not wait for \ +server interaction. +* Convenience: because Gertty downloads all changes to local git repos, a \ +single command instructs it to checkout a change into that repo for detailed \ +examination or testing of larger changes." +HOMEPAGE="https://github.com/openstack/gertty" +COPYRIGHT="2014-2018 OpenStack Foundation, Hewlett-Packard Development Company, L.P." +LICENSE="Apache v2" +SOURCE_URI="https://files.pythonhosted.org/packages/67/b2/a19b590919cfc659b64e7dcd21ed8b7d3aa46844227e172c2ffe67d64413/gertty-$portVersion.tar.gz" +CHECKSUM_SHA256="290e4dc688b2f4d6886f0493b861c01a8c0419dd6c49a925fba0b936d3f28b23" +REVISION="1" +PATCHES="gertty-$portVersion.patchset" + +ARCHITECTURES="any" + +PROVIDES=" + gertty = $portVersion + cmd:gertty = $portVersion + " +REQUIRES=" + haiku + cmd:python3 + dateutil_python3 + gitdb_python3 + gitpython_python3 + pbr_python3 + ply_python3 + pypandoc_python3 + six_python3 + smmap_python3 + sqlalchemy_python3 + " + +BUILD_REQUIRES=" + haiku_devel + " + +PYTHON_PACKAGES=(python3) +PYTHON_VERSIONS=(3.6) +for i in "${!PYTHON_PACKAGES[@]}"; do +pythonPackage=${PYTHON_PACKAGES[i]} +pythonVersion=${PYTHON_VERSIONS[$i]} +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" +done + +INSTALL() +{ + for i in "${!PYTHON_PACKAGES[@]}"; do + pythonPackage=${PYTHON_PACKAGES[i]} + pythonVersion=${PYTHON_VERSIONS[$i]} + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + rm -rf build + $python setup.py build install \ + --root=/ --prefix=$prefix + done +} + diff --git a/dev-util/gertty/patches/gertty-1.5.0.patchset b/dev-util/gertty/patches/gertty-1.5.0.patchset new file mode 100644 index 000000000..788fd3aa0 --- /dev/null +++ b/dev-util/gertty/patches/gertty-1.5.0.patchset @@ -0,0 +1,250 @@ +From a1d9209b9d917506fe9de37f3477e36fbe12fd13 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Fri, 27 Jul 2018 18:32:09 +0200 +Subject: Put documentation at the right place. + + +diff --git a/PKG-INFO b/PKG-INFO +index 0a11826..60565f4 100644 +--- a/PKG-INFO ++++ b/PKG-INFO +@@ -95,7 +95,7 @@ Description: Gertty + ``~/.gertty.yaml``. Several sample configuration files are included. + You can find them in the examples/ directory of the + `source distribution `_ +- or the share/gertty/examples directory after installation. ++ or the documentation/packages/gertty/examples directory after installation. + + Select one of the sample config files, copy it to ~/.gertty.yaml and + edit as necessary. Search for ``CHANGEME`` to find parameters that +diff --git a/README.rst b/README.rst +index c00b43c..9e9759f 100644 +--- a/README.rst ++++ b/README.rst +@@ -87,7 +87,7 @@ Gertty uses a YAML based configuration file that it looks for at + ``~/.gertty.yaml``. Several sample configuration files are included. + You can find them in the examples/ directory of the + `source distribution `_ +-or the share/gertty/examples directory after installation. ++or the documentation/packages/gertty/examples directory after installation. + + Select one of the sample config files, copy it to ~/.gertty.yaml and + edit as necessary. Search for ``CHANGEME`` to find parameters that +diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst +index 56e7718..bcb638a 100644 +--- a/doc/source/configuration.rst ++++ b/doc/source/configuration.rst +@@ -5,7 +5,7 @@ Gertty uses a YAML based configuration file that it looks for at + ``~/.gertty.yaml``. Several sample configuration files are included. + You can find them in the examples/ directory of the + `source distribution `_ +-or the share/gertty/examples directory after installation. ++or the documentation/packages/gertty/examples directory after installation. + + Select one of the sample config files, copy it to ~/.gertty.yaml and + edit as necessary. Search for ``CHANGEME`` to find parameters that +diff --git a/gertty.egg-info/PKG-INFO b/gertty.egg-info/PKG-INFO +index 0a11826..60565f4 100644 +--- a/gertty.egg-info/PKG-INFO ++++ b/gertty.egg-info/PKG-INFO +@@ -95,7 +95,7 @@ Description: Gertty + ``~/.gertty.yaml``. Several sample configuration files are included. + You can find them in the examples/ directory of the + `source distribution `_ +- or the share/gertty/examples directory after installation. ++ or the documentation/packages/gertty/examples directory after installation. + + Select one of the sample config files, copy it to ~/.gertty.yaml and + edit as necessary. Search for ``CHANGEME`` to find parameters that +diff --git a/gertty/config.py b/gertty/config.py +index 1c6f94a..e17624a 100644 +--- a/gertty/config.py ++++ b/gertty/config.py +@@ -255,7 +255,7 @@ class Config(object): + return None + + def printSample(self): +- filename = 'share/gertty/examples' ++ filename = 'documentation/packages/gertty/examples' + print("""Gertty requires a configuration file at ~/.gertty.yaml + If the file contains a password then permissions must be set to 0600. + +diff --git a/setup.cfg b/setup.cfg +index 37691b3..3882402 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -22,7 +22,7 @@ keywords = gerrit console urwid review + packages = + gertty + data_files = +- share/gertty/examples = examples/* ++ documentation/packages/gertty/examples = examples/* + + [entry_points] + console_scripts = +-- +2.16.4 + + +From 10e815bd16f45bc9a35445303f29f0659384e2bb Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 12 Aug 2018 14:12:49 +0200 +Subject: Fix config file location. + + +diff --git a/PKG-INFO b/PKG-INFO +index 60565f4..be5f98d 100644 +--- a/PKG-INFO ++++ b/PKG-INFO +@@ -92,12 +92,12 @@ Description: Gertty + pip install . + + Gertty uses a YAML based configuration file that it looks for at +- ``~/.gertty.yaml``. Several sample configuration files are included. ++ ``~/config/settings/gertty.yaml``. Several sample configuration files are included. + You can find them in the examples/ directory of the + `source distribution `_ + or the documentation/packages/gertty/examples directory after installation. + +- Select one of the sample config files, copy it to ~/.gertty.yaml and ++ Select one of the sample config files, copy it to ~/config/settings/gertty.yaml and + edit as necessary. Search for ``CHANGEME`` to find parameters that + need to be supplied. The sample config files are as follows: + +diff --git a/README.rst b/README.rst +index 9e9759f..f044a80 100644 +--- a/README.rst ++++ b/README.rst +@@ -84,12 +84,12 @@ To install from a git checkout:: + pip install . + + Gertty uses a YAML based configuration file that it looks for at +-``~/.gertty.yaml``. Several sample configuration files are included. ++``~/config/gertty.yaml``. Several sample configuration files are included. + You can find them in the examples/ directory of the + `source distribution `_ + or the documentation/packages/gertty/examples directory after installation. + +-Select one of the sample config files, copy it to ~/.gertty.yaml and ++Select one of the sample config files, copy it to ~/config/gertty.yaml and + edit as necessary. Search for ``CHANGEME`` to find parameters that + need to be supplied. The sample config files are as follows: + +diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst +index bcb638a..6204cb4 100644 +--- a/doc/source/configuration.rst ++++ b/doc/source/configuration.rst +@@ -2,12 +2,12 @@ Configuration + ------------- + + Gertty uses a YAML based configuration file that it looks for at +-``~/.gertty.yaml``. Several sample configuration files are included. ++``~/config/settings/gertty.yaml``. Several sample configuration files are included. + You can find them in the examples/ directory of the + `source distribution `_ + or the documentation/packages/gertty/examples directory after installation. + +-Select one of the sample config files, copy it to ~/.gertty.yaml and ++Select one of the sample config files, copy it to ~/config/settings/gertty.yaml and + edit as necessary. Search for ``CHANGEME`` to find parameters that + need to be supplied. The sample config files are as follows: + +diff --git a/examples/googlesource-gertty.yaml b/examples/googlesource-gertty.yaml +index 0663e48..eabee65 100644 +--- a/examples/googlesource-gertty.yaml ++++ b/examples/googlesource-gertty.yaml +@@ -1,4 +1,4 @@ +-# This is an example ~/.gertty.yaml file for use with installations of ++# This is an example ~/config/settings/gertty.yaml file for use with installations of + # Gerrit running on googlesource.com. Most of these options are not + # required, rather, they customize Gertty to better deal with the + # particulars of Google's Gerrit configuration. +diff --git a/examples/minimal-gertty.yaml b/examples/minimal-gertty.yaml +index c61e943..c46e40d 100644 +--- a/examples/minimal-gertty.yaml ++++ b/examples/minimal-gertty.yaml +@@ -1,4 +1,4 @@ +-# This is an example ~/.gertty.yaml file with only the required ++# This is an example ~/config/settings/gertty.yaml file with only the required + # settings. + + # This file does not list all of the available options. For a full +diff --git a/examples/openstack-gertty.yaml b/examples/openstack-gertty.yaml +index 3014bc0..4536a0d 100644 +--- a/examples/openstack-gertty.yaml ++++ b/examples/openstack-gertty.yaml +@@ -1,4 +1,4 @@ +-# This is an example ~/.gertty.yaml file for use with OpenStack's ++# This is an example ~/config/settings/gertty.yaml file for use with OpenStack's + # Gerrit. Most of these options are not required, rather, they + # customize Gertty to better deal with the particulars of OpenStack's + # Gerrit configuration. +diff --git a/examples/reference-gertty.yaml b/examples/reference-gertty.yaml +index 83b4e3c..be7d44b 100644 +--- a/examples/reference-gertty.yaml ++++ b/examples/reference-gertty.yaml +@@ -1,4 +1,4 @@ +-# This is an example ~/.gertty.yaml with an exhaustive listing of ++# This is an example ~/config/settings/gertty.yaml with an exhaustive listing of + # options with commentary. + + # This section lists the servers that Gertty can talk to. Multiple +diff --git a/gertty.egg-info/PKG-INFO b/gertty.egg-info/PKG-INFO +index 60565f4..9330074 100644 +--- a/gertty.egg-info/PKG-INFO ++++ b/gertty.egg-info/PKG-INFO +@@ -92,12 +92,12 @@ Description: Gertty + pip install . + + Gertty uses a YAML based configuration file that it looks for at +- ``~/.gertty.yaml``. Several sample configuration files are included. ++ ``~/config/gertty.yaml``. Several sample configuration files are included. + You can find them in the examples/ directory of the + `source distribution `_ + or the documentation/packages/gertty/examples directory after installation. + +- Select one of the sample config files, copy it to ~/.gertty.yaml and ++ Select one of the sample config files, copy it to ~/config/gertty.yaml and + edit as necessary. Search for ``CHANGEME`` to find parameters that + need to be supplied. The sample config files are as follows: + +diff --git a/gertty/config.py b/gertty/config.py +index e17624a..2d82b84 100644 +--- a/gertty/config.py ++++ b/gertty/config.py +@@ -35,7 +35,7 @@ try: + except AttributeError: + OrderedDict = ordereddict.OrderedDict + +-DEFAULT_CONFIG_PATH='~/.gertty.yaml' ++DEFAULT_CONFIG_PATH='~/config/settings/gertty.yaml' + + class ConfigSchema(object): + server = {v.Required('name'): str, +@@ -256,7 +256,7 @@ class Config(object): + + def printSample(self): + filename = 'documentation/packages/gertty/examples' +- print("""Gertty requires a configuration file at ~/.gertty.yaml ++ print("""Gertty requires a configuration file at ~/config/settings/gertty.yaml + If the file contains a password then permissions must be set to 0600. + + Several sample configuration files were installed with Gertty and are +diff --git a/setup.cfg b/setup.cfg +index 3882402..979a14b 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -23,6 +23,10 @@ packages = + gertty + data_files = + documentation/packages/gertty/examples = examples/* ++package-data = ++ gertty = alembic/versions/* ++ gertty = alembic/*.py alembic/*.mako alembic/README ++ gertty = *.ini + + [entry_points] + console_scripts = +-- +2.16.4 +