haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
master
haikuports/dev-util/gertty/patches/gertty-1.6.0.patchset

321 lines
12 KiB
Plaintext
Raw Permalink Blame History

From 73fb58d48bb12aeb70ec10f7f64ce9adf29198f7 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Tue, 5 Jul 2022 13:30:07 +0200
Subject: Put documentation at the right place.
diff --git a/PKG-INFO b/PKG-INFO
index be9b976..fc8dffa 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -96,7 +96,7 @@ Description: Gertty
are included. You can find them in the examples/ directory of the
`source distribution
<https://opendev.org/ttygroup/gertty/src/branch/master/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
~/.config/gertty/gertty.yaml and edit as necessary. Search for
diff --git a/README.rst b/README.rst
index 8717fa1..0de1004 100644
--- a/README.rst
+++ b/README.rst
@@ -88,7 +88,7 @@ Gertty uses a YAML based configuration file that it looks for at
are included. You can find them in the examples/ directory of the
`source distribution
<https://opendev.org/ttygroup/gertty/src/branch/master/examples>`_ or
-the share/gertty/examples directory after installation.
+the documentation/packages/gertty/examples directory after installation.
Select one of the sample config files, copy it to
~/.config/gertty/gertty.yaml and edit as necessary. Search for
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index f9ba291..2c0c744 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -6,7 +6,7 @@ Gertty uses a YAML based configuration file that it looks for at
are included. You can find them in the examples/ directory of the
`source distribution
<https://opendev.org/ttygroup/gertty/src/branch/master/examples>`_ or
-the share/gertty/examples directory after installation.
+the documentation/packages/gertty/examples directory after installation.
Select one of the sample config files, copy it to ~/.config/gertty/gertty.yaml
and edit as necessary. Search for ``CHANGEME`` to find parameters that need to
diff --git a/gertty.egg-info/PKG-INFO b/gertty.egg-info/PKG-INFO
index be9b976..4a166d1 100644
--- a/gertty.egg-info/PKG-INFO
+++ b/gertty.egg-info/PKG-INFO
@@ -96,7 +96,7 @@ Description: Gertty
are included. You can find them in the examples/ directory of the
`source distribution
<https://opendev.org/ttygroup/gertty/src/branch/master/examples>`_ or
- the share/gertty/examples directory after installation.
+ the documentation/packages/gertty/examples directory after installation.
Select one of the sample config files, copy it to
~/.config/gertty/gertty.yaml and edit as necessary. Search for
diff --git a/gertty/config.py b/gertty/config.py
index 4f38d14..1a33a2d 100644
--- a/gertty/config.py
+++ b/gertty/config.py
@@ -281,7 +281,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 0879e81..25952d5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,12 +1,12 @@
[metadata]
name = gertty
summary = Gertty is a console-based interface to the Gerrit Code Review system.
-description-file =
+description-file =
README.rst
author = The TTY Group
author-email = openstack-infra@lists.openstack.org
home-page = http://ttygroup.org/
-classifier =
+classifier =
Topic :: Utilities
Intended Audience :: Developers
Intended Audience :: Information Technology
@@ -19,16 +19,16 @@ classifier =
keywords = gerrit console urwid review
[files]
-packages =
+packages =
gertty
-data_files =
- share/gertty/examples = examples/*
+data_files =
+ documentation/packages/gertty/examples = examples/*
[entry_points]
-console_scripts =
+console_scripts =
gertty = gertty.app:main
[egg_info]
-tag_build =
+tag_build =
tag_date = 0
--
2.45.2
From 45ad9375c18779140d34a9f2a2f804e3fb88b8a1 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Tue, 5 Jul 2022 13:47:02 +0200
Subject: Fix config file location.
This is a squashed version of the previous commits by
Begasus and Pulkomandy.
diff --git a/PKG-INFO b/PKG-INFO
index fc8dffa..0ea6840 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -92,14 +92,14 @@ Description: Gertty
pip install .
Gertty uses a YAML based configuration file that it looks for at
- ``~/.config/gertty/gertty.yaml``. Several sample configuration files
+ ``~/config/settings/gertty.yaml``. Several sample configuration files are included.
are included. You can find them in the examples/ directory of the
`source distribution
<https://opendev.org/ttygroup/gertty/src/branch/master/examples>`_ or
or the documentation/packages/gertty/examples directory after installation.
Select one of the sample config files, copy it to
- ~/.config/gertty/gertty.yaml and edit as necessary. Search for
+ ~/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 0de1004..71c706f 100644
--- a/README.rst
+++ b/README.rst
@@ -84,14 +84,14 @@ To install from a git checkout::
pip install .
Gertty uses a YAML based configuration file that it looks for at
-``~/.config/gertty/gertty.yaml``. Several sample configuration files
+``~/config/settings/gertty.yaml``. Several sample configuration files
are included. You can find them in the examples/ directory of the
`source distribution
<https://opendev.org/ttygroup/gertty/src/branch/master/examples>`_ or
the documentation/packages/gertty/examples directory after installation.
Select one of the sample config files, copy it to
-~/.config/gertty/gertty.yaml and edit as necessary. Search for
+~/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/doc/source/configuration.rst b/doc/source/configuration.rst
index 2c0c744..e0c6780 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -2,13 +2,13 @@ Configuration
-------------
Gertty uses a YAML based configuration file that it looks for at
-``~/.config/gertty/gertty.yaml``. Several sample configuration files
+``~/config/settings/gertty.yaml``. Several sample configuration files
are included. You can find them in the examples/ directory of the
`source distribution
<https://opendev.org/ttygroup/gertty/src/branch/master/examples>`_ or
the documentation/packages/gertty/examples directory after installation.
-Select one of the sample config files, copy it to ~/.config/gertty/gertty.yaml
+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 c749cab..2932dec 100644
--- a/examples/googlesource-gertty.yaml
+++ b/examples/googlesource-gertty.yaml
@@ -1,4 +1,4 @@
-# This is an example ~/.config/gertty/gertty.yaml file for use with
+# 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 22a9aa3..c46e40d 100644
--- a/examples/minimal-gertty.yaml
+++ b/examples/minimal-gertty.yaml
@@ -1,4 +1,4 @@
-# This is an example ~/.config/gertty/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/opendev-gertty.yaml b/examples/opendev-gertty.yaml
index 33fc67e..7beb700 100644
--- a/examples/opendev-gertty.yaml
+++ b/examples/opendev-gertty.yaml
@@ -1,4 +1,4 @@
-# This is an example ~/.config/gertty/gertty.yaml file for use with
+# This is an example ~/config/settings/gertty.yaml file for use with
# OpenDev's Gerrit. Most of these options are not required, rather,
# they customize Gertty to better deal with the particulars of
# OpenDev's Gerrit configuration.
diff --git a/examples/rdo-gertty.yaml b/examples/rdo-gertty.yaml
index 3e8c69f..4be47ce 100644
--- a/examples/rdo-gertty.yaml
+++ b/examples/rdo-gertty.yaml
@@ -1,4 +1,4 @@
-# This is an example ~/.config/gertty/gertty.yaml file for use with
+# This is an example ~/config/settings/gertty.yaml file for use with
# RDO's Gerrit. Most of these options are not required, rather, they
# customize Gertty to better deal with the particulars of RDO's Gerrit
# configuration.
diff --git a/examples/reference-gertty.yaml b/examples/reference-gertty.yaml
index b6f65b7..75ed86b 100644
--- a/examples/reference-gertty.yaml
+++ b/examples/reference-gertty.yaml
@@ -1,4 +1,4 @@
-# This is an example ~/.config/gertty/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 4a166d1..8aaca04 100644
--- a/gertty.egg-info/PKG-INFO
+++ b/gertty.egg-info/PKG-INFO
@@ -92,14 +92,14 @@ Description: Gertty
pip install .
Gertty uses a YAML based configuration file that it looks for at
- ``~/.config/gertty/gertty.yaml``. Several sample configuration files
+ ``~/config/settings/gertty.yaml``. Several sample configuration files
are included. You can find them in the examples/ directory of the
`source distribution
<https://opendev.org/ttygroup/gertty/src/branch/master/examples>`_ or
the documentation/packages/gertty/examples directory after installation.
Select one of the sample config files, copy it to
- ~/.config/gertty/gertty.yaml and edit as necessary. Search for
+ ~/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/gertty/config.py b/gertty/config.py
index 1a33a2d..b3ce7ba 100644
--- a/gertty/config.py
+++ b/gertty/config.py
@@ -36,7 +36,7 @@ try:
except AttributeError:
OrderedDict = ordereddict.OrderedDict
-DEFAULT_CONFIG_PATH = '~/.config/gertty/gertty.yaml'
+DEFAULT_CONFIG_PATH = '~/config/settings/gertty.yaml'
FALLBACK_CONFIG_PATH = '~/.gertty.yaml'
class ConfigSchema(object):
@@ -282,7 +282,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 25952d5..634ce27 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.45.2
From 01cfda0ee844d264150161ffa300b6989df0c1cb Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Fri, 15 Jul 2022 18:08:45 +0200
Subject: Backport fix for alembic >= 1.7 from upstream
Without this, gertty crashes on start.
diff --git a/gertty/db.py b/gertty/db.py
index 3bb7ddd..7f4388a 100644
--- a/gertty/db.py
+++ b/gertty/db.py
@@ -20,6 +20,7 @@ import threading
import alembic
import alembic.config
+import alembic.migration
import six
import sqlalchemy
from sqlalchemy import create_engine, MetaData, Table, Column, Integer, String, Boolean, DateTime, Text, UniqueConstraint
--
2.45.2
Reference in New Issue View Git Blame Copy Permalink