nephele
/
haikuports
0
0
Fork 0
Code Releases Activity
haikuports/dev-util/gertty/patches/gertty-1.5.0.patchset

251 lines
11 KiB
Plaintext
Raw Permalink Blame History

From a1d9209b9d917506fe9de37f3477e36fbe12fd13 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
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 <https://git.openstack.org/cgit/openstack/gertty/tree/examples>`_
- 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 <https://git.openstack.org/cgit/openstack/gertty/tree/examples>`_
-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 <https://git.openstack.org/cgit/openstack/gertty/tree/examples>`_
-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 <https://git.openstack.org/cgit/openstack/gertty/tree/examples>`_
- 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 <pulkomandy@pulkomandy.tk>
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 <https://git.openstack.org/cgit/openstack/gertty/tree/examples>`_
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 <https://git.openstack.org/cgit/openstack/gertty/tree/examples>`_
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 <https://git.openstack.org/cgit/openstack/gertty/tree/examples>`_
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 <https://git.openstack.org/cgit/openstack/gertty/tree/examples>`_
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
View Git Blame Copy Permalink