haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-18 09:40:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
d1494deec257e85a72c54c623d0d43fc58eacf10
haikuports/dev-util/gertty/patches/gertty-1.6.0.patchset
PulkoMandy 241f7a4f2f gertty: fix exception on start and location of config file. 
However it now crashes python when starting :(
2022-07-15 18:12:06 +02:00

896 lines
31 KiB
Plaintext
Raw Blame History

From 8b4b0c4e16c93b3d055a3fa074db03b14edce7b2 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..1892406 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -8,118 +8,118 @@ Author-email: openstack-infra@lists.openstack.org
License: UNKNOWN
Description: Gertty
======
-
+
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.
-
+
Installation
------------
-
+
Debian
~~~~~~
-
+
Gertty is packaged in Debian and is currently available in:
-
+
* unstable
* testing
* stable
-
+
You can install it with::
-
+
apt-get install gertty
-
+
Fedora
~~~~~~
-
+
Gertty is packaged starting in Fedora 21. You can install it with::
-
+
dnf install python-gertty
-
+
openSUSE
~~~~~~~~
-
+
Gertty is packaged for openSUSE 13.1 onwards. You can install it via
`1-click install from the Open Build Service <http://software.opensuse.org/package/python-gertty>`_.
-
+
Gentoo
~~~~~~
-
+
Gertty is available in the main Gentoo repository. You can install it with::
-
+
emerge gertty
-
+
Arch Linux
~~~~~~~~~~
-
+
Gertty packages are available in the Arch User Repository packages. You
can get the package from::
-
+
https://aur.archlinux.org/packages/python2-gertty/
-
+
Source
~~~~~~
-
+
When installing from source, it is recommended (but not required) to
install Gertty in a virtualenv. To set one up::
-
+
virtualenv gertty-env
source gertty-env/bin/activate
-
+
To install the latest version from the cheeseshop::
-
+
pip install gertty
-
+
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
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
``CHANGEME`` to find parameters that need to be supplied. The sample
config files are as follows:
-
+
**minimal-gertty.yaml**
Only contains the parameters required for Gertty to actually run.
-
+
**reference-gertty.yaml**
An exhaustive list of all supported options with examples.
-
+
**opendev-gertty.yaml**
A configuration designed for use with OpenDev's installation of
Gerrit.
-
+
**googlesource-gertty.yaml**
A configuration designed for use with installations of Gerrit
running on googlesource.com.
-
+
You will need your Gerrit password which you can generate or retrieve
by navigating to ``Settings``, then ``HTTP Password``.
-
+
Gertty uses local git repositories to perform much of its work. These
can be the same git repositories that you use when developing a
project. Gertty will not alter the working directory or index unless
@@ -127,46 +127,46 @@ Description: Gertty
accidentally losing work remain in place). You will need to supply
the name of a directory where Gertty will find or clone git
repositories for your projects as the ``git-root`` parameter.
-
+
The config file is designed to support multiple Gerrit instances. The
first one is used by default, but others can be specified by supplying
the name on the command line.
-
+
Usage
-----
-
+
After installing Gertty, you should be able to run it by invoking
``gertty``. If you installed it in a virtualenv, you can invoke it
without activating the virtualenv with ``/path/to/venv/bin/gertty``
which you may wish to add to your shell aliases. Use ``gertty
--help`` to see a list of command line options available.
-
+
Once Gertty is running, you will need to start by subscribing to some
projects. Use 'L' to list all of the projects and then 's' to
subscribe to the ones you are interested in. Hit 'L' again to shrink
the list to your subscribed projects.
-
+
In general, pressing the F1 key will show help text on any screen, and
ESC will take you to the previous screen.
-
+
Gertty works seamlessly offline or online. All of the actions that it
performs are first recorded in a local database (in ``~/.gertty.db``
by default), and are then transmitted to Gerrit. If Gertty is unable
to contact Gerrit for any reason, it will continue to operate against
the local database, and once it re-establishes contact, it will
process any pending changes.
-
+
The status bar at the top of the screen displays the current number of
outstanding tasks that Gertty must perform in order to be fully up to
date. Some of these tasks are more complicated than others, and some
of them will end up creating new tasks (for instance, one task may be
to search for new changes in a project which will then produce 5 new
tasks if there are 5 new changes).
-
+
If Gertty is offline, it will so indicate in the status bar. It will
retry requests if needed, and will switch between offline and online
mode automatically.
-
+
If you review a change while offline with a positive vote, and someone
else leaves a negative vote on that change in the same category before
Gertty is able to upload your review, Gertty will detect the situation
@@ -176,36 +176,36 @@ Description: Gertty
`F12` key by default). When viewing a change, the "held" flag may be
toggled with the exclamation key (`!`). Once held, a change must be
explicitly un-held in this manner for your review to be uploaded.
-
+
If Gertty encounters an error, this will also be indicated in the
status bar. You may wish to examine ~/.gertty.log to see what the
error was. In many cases, Gertty can continue after encountering an
error. The error flag will be cleared when you leave the current
screen.
-
+
To select text (e.g., to copy to the clipboard), hold Shift while
selecting the text.
-
+
MacOS
~~~~~
-
+
The MacOS terminal blocks ctrl+o, which is the default search key combo in
Gertty. To fix this, a custom keymap can be used on MacOS which modifies the
search key combo. For example::
-
+
keymaps:
- name: default # MacOS blocks ctrl+o
change-search: 'ctrl s'
interactive-search: 'ctrl i'
-
+
Terminal Integration
--------------------
-
+
If you use rxvt-unicode, you can add something like the following to
``.Xresources`` to make Gerrit URLs that are displayed in your
terminal (perhaps in an email or irc client) clickable links that open
in Gertty::
-
+
URxvt.perl-ext: default,matcher
URxvt.url-launcher: sensible-browser
URxvt.keysym.C-Delete: perl:matcher:last
@@ -213,22 +213,22 @@ Description: Gertty
URxvt.matcher.button: 1
URxvt.matcher.pattern.1: https:\/\/review.example.org/(\\#\/c\/)?(\\d+)[\w]*
URxvt.matcher.launcher.1: gertty --open $0
-
+
You will want to adjust the pattern to match the review site you are
interested in; multiple patterns may be added as needed.
-
+
Contributing
------------
-
+
For information on how to contribute to Gertty, please see the
contents of the CONTRIBUTING.rst file.
-
+
Bugs
----
-
+
Bugs are handled at: https://storyboard.openstack.org/#!/project/ttygroup/gertty
-
-
+
+
Keywords: gerrit console urwid review
Platform: UNKNOWN
Classifier: Topic :: Utilities
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..560c155 100644
--- a/gertty.egg-info/PKG-INFO
+++ b/gertty.egg-info/PKG-INFO
@@ -8,118 +8,118 @@ Author-email: openstack-infra@lists.openstack.org
License: UNKNOWN
Description: Gertty
======
-
+
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.
-
+
Installation
------------
-
+
Debian
~~~~~~
-
+
Gertty is packaged in Debian and is currently available in:
-
+
* unstable
* testing
* stable
-
+
You can install it with::
-
+
apt-get install gertty
-
+
Fedora
~~~~~~
-
+
Gertty is packaged starting in Fedora 21. You can install it with::
-
+
dnf install python-gertty
-
+
openSUSE
~~~~~~~~
-
+
Gertty is packaged for openSUSE 13.1 onwards. You can install it via
`1-click install from the Open Build Service <http://software.opensuse.org/package/python-gertty>`_.
-
+
Gentoo
~~~~~~
-
+
Gertty is available in the main Gentoo repository. You can install it with::
-
+
emerge gertty
-
+
Arch Linux
~~~~~~~~~~
-
+
Gertty packages are available in the Arch User Repository packages. You
can get the package from::
-
+
https://aur.archlinux.org/packages/python2-gertty/
-
+
Source
~~~~~~
-
+
When installing from source, it is recommended (but not required) to
install Gertty in a virtualenv. To set one up::
-
+
virtualenv gertty-env
source gertty-env/bin/activate
-
+
To install the latest version from the cheeseshop::
-
+
pip install gertty
-
+
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
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 be supplied. The sample
config files are as follows:
-
+
**minimal-gertty.yaml**
Only contains the parameters required for Gertty to actually run.
-
+
**reference-gertty.yaml**
An exhaustive list of all supported options with examples.
-
+
**opendev-gertty.yaml**
A configuration designed for use with OpenDev's installation of
Gerrit.
-
+
**googlesource-gertty.yaml**
A configuration designed for use with installations of Gerrit
running on googlesource.com.
-
+
You will need your Gerrit password which you can generate or retrieve
by navigating to ``Settings``, then ``HTTP Password``.
-
+
Gertty uses local git repositories to perform much of its work. These
can be the same git repositories that you use when developing a
project. Gertty will not alter the working directory or index unless
@@ -127,46 +127,46 @@ Description: Gertty
accidentally losing work remain in place). You will need to supply
the name of a directory where Gertty will find or clone git
repositories for your projects as the ``git-root`` parameter.
-
+
The config file is designed to support multiple Gerrit instances. The
first one is used by default, but others can be specified by supplying
the name on the command line.
-
+
Usage
-----
-
+
After installing Gertty, you should be able to run it by invoking
``gertty``. If you installed it in a virtualenv, you can invoke it
without activating the virtualenv with ``/path/to/venv/bin/gertty``
which you may wish to add to your shell aliases. Use ``gertty
--help`` to see a list of command line options available.
-
+
Once Gertty is running, you will need to start by subscribing to some
projects. Use 'L' to list all of the projects and then 's' to
subscribe to the ones you are interested in. Hit 'L' again to shrink
the list to your subscribed projects.
-
+
In general, pressing the F1 key will show help text on any screen, and
ESC will take you to the previous screen.
-
+
Gertty works seamlessly offline or online. All of the actions that it
performs are first recorded in a local database (in ``~/.gertty.db``
by default), and are then transmitted to Gerrit. If Gertty is unable
to contact Gerrit for any reason, it will continue to operate against
the local database, and once it re-establishes contact, it will
process any pending changes.
-
+
The status bar at the top of the screen displays the current number of
outstanding tasks that Gertty must perform in order to be fully up to
date. Some of these tasks are more complicated than others, and some
of them will end up creating new tasks (for instance, one task may be
to search for new changes in a project which will then produce 5 new
tasks if there are 5 new changes).
-
+
If Gertty is offline, it will so indicate in the status bar. It will
retry requests if needed, and will switch between offline and online
mode automatically.
-
+
If you review a change while offline with a positive vote, and someone
else leaves a negative vote on that change in the same category before
Gertty is able to upload your review, Gertty will detect the situation
@@ -176,36 +176,36 @@ Description: Gertty
`F12` key by default). When viewing a change, the "held" flag may be
toggled with the exclamation key (`!`). Once held, a change must be
explicitly un-held in this manner for your review to be uploaded.
-
+
If Gertty encounters an error, this will also be indicated in the
status bar. You may wish to examine ~/.gertty.log to see what the
error was. In many cases, Gertty can continue after encountering an
error. The error flag will be cleared when you leave the current
screen.
-
+
To select text (e.g., to copy to the clipboard), hold Shift while
selecting the text.
-
+
MacOS
~~~~~
-
+
The MacOS terminal blocks ctrl+o, which is the default search key combo in
Gertty. To fix this, a custom keymap can be used on MacOS which modifies the
search key combo. For example::
-
+
keymaps:
- name: default # MacOS blocks ctrl+o
change-search: 'ctrl s'
interactive-search: 'ctrl i'
-
+
Terminal Integration
--------------------
-
+
If you use rxvt-unicode, you can add something like the following to
``.Xresources`` to make Gerrit URLs that are displayed in your
terminal (perhaps in an email or irc client) clickable links that open
in Gertty::
-
+
URxvt.perl-ext: default,matcher
URxvt.url-launcher: sensible-browser
URxvt.keysym.C-Delete: perl:matcher:last
@@ -213,22 +213,22 @@ Description: Gertty
URxvt.matcher.button: 1
URxvt.matcher.pattern.1: https:\/\/review.example.org/(\\#\/c\/)?(\\d+)[\w]*
URxvt.matcher.launcher.1: gertty --open $0
-
+
You will want to adjust the pattern to match the review site you are
interested in; multiple patterns may be added as needed.
-
+
Contributing
------------
-
+
For information on how to contribute to Gertty, please see the
contents of the CONTRIBUTING.rst file.
-
+
Bugs
----
-
+
Bugs are handled at: https://storyboard.openstack.org/#!/project/ttygroup/gertty
-
-
+
+
Keywords: gerrit console urwid review
Platform: UNKNOWN
Classifier: Topic :: Utilities
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.36.1
From 91b5a31f554268173fdcf8cf52aed5d7c62b890e 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.
Co-authored-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
diff --git a/PKG-INFO b/PKG-INFO
index 1892406..4098449 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 560c155..ad2f072 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..21348f0 100644
--- a/gertty/config.py
+++ b/gertty/config.py
@@ -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.36.1
From 7c802c6430cf015da4e22f44c8dec0c2cc3e26dd Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Fri, 15 Jul 2022 18:07:53 +0200
Subject: Actually fix the configuation file path
The previous patch changed everything (messages, documentation) except
the actual place where the config file location is defined.
diff --git a/gertty/config.py b/gertty/config.py
index 21348f0..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):
--
2.36.1
From 4c9c92797c5b306e4cffb88e551e16ecf3ea8bb8 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.36.1
Reference in New Issue View Git Blame Copy Permalink