diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dccd38..ce74204 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,24 +5,6 @@ All notable changes to rattail-fabric2 will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## v0.4.6 (2025-09-06) - -### Fix - -- add `apt.is_installed()` function - -## v0.4.5 (2025-02-01) - -### Fix - -- purge email settings for wuttjamaican also - -## v0.4.4 (2024-10-03) - -### Fix - -- update project source links, kallithea -> forgejo - ## v0.4.3 (2024-08-06) ### Fix diff --git a/README.md b/README.md deleted file mode 100644 index cceb155..0000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ - -# rattail-fabric2 - -Rattail is a retail software framework, released under the GNU General Public -License. - -This package contains various utility functions for use with -[Fabric](http://www.fabfile.org/) (v2). - -Please see Rattail's [home page](https://rattailproject.org/) for more -information. diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..e124b61 --- /dev/null +++ b/README.rst @@ -0,0 +1,14 @@ + +rattail-fabric2 +=============== + +Rattail is a retail software framework, released under the GNU General Public +License. + +This package contains various utility functions for use with `Fabric`_ (v2). + +.. _`Fabric`: http://www.fabfile.org/ + +Please see Rattail's `home page`_ for more information. + +.. _`home page`: https://rattailproject.org/ diff --git a/pyproject.toml b/pyproject.toml index b023bf6..8cf837a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,9 +6,9 @@ build-backend = "hatchling.build" [project] name = "rattail-fabric2" -version = "0.4.6" +version = "0.4.3" description = "Fabric (v2) Utilities for Rattail" -readme = "README.md" +readme = "README.rst" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] license = {text = "GNU GPL v3+"} classifiers = [ @@ -31,8 +31,8 @@ dependencies = [ [project.urls] Homepage = "https://rattailproject.org" -Repository = "https://forgejo.wuttaproject.org/rattail/rattail-fabric2" -Changelog = "https://forgejo.wuttaproject.org/rattail/rattail-fabric2/src/branch/master/CHANGELOG.md" +Repository = "https://kallithea.rattailproject.org/rattail-project/rattail-fabric2" +Changelog = "https://kallithea.rattailproject.org/rattail-project/rattail-fabric2/files/master/CHANGELOG.md" [tool.commitizen] diff --git a/rattail_fabric2/apt.py b/rattail_fabric2/apt.py index 1dd8014..e685c5a 100644 --- a/rattail_fabric2/apt.py +++ b/rattail_fabric2/apt.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2025 Lance Edgar +# Copyright © 2010-2018 Lance Edgar # # This file is part of Rattail. # @@ -44,19 +44,6 @@ def install(c, *packages, **kwargs): frontend, target, force_yes, ' '.join(packages)), **kwargs) -def is_installed(c, package): - """ - Check if the given APT package is installed. - - :param c: Fabric connection. - - :param package: Name of package to be checked. - - :returns: ``True`` if package is installed, else ``False``. - """ - return c.run(f"dpkg-query -s {package}", warn=True).ok - - def purge(c, *packages): """ Uninstall and purge config for given packages diff --git a/rattail_fabric2/backup.py b/rattail_fabric2/backup.py index ce64770..bb26607 100644 --- a/rattail_fabric2/backup.py +++ b/rattail_fabric2/backup.py @@ -103,7 +103,7 @@ def deploy_backup_app(c, deploy, envname, mkvirtualenv=True, user='rattail', # rattail mkdir(c, os.path.join(envpath, 'src'), use_sudo=True, runas_user=user) if not exists(c, os.path.join(envpath, 'src/rattail')): - c.sudo(f'git clone https://forgejo.wuttaproject.org/rattail/rattail.git {envpath}/src/rattail', user=user) + c.sudo('git clone https://kallithea.rattailproject.org/rattail-project/rattail {}/src/rattail'.format(envpath), user=user) c.sudo("bash -c 'PIP_CONFIG_FILE={0}/pip.conf {0}/bin/pip install --editable {0}/src/rattail'".format(envpath), user=user) deploy_generic(c, 'backup/git-exclude', os.path.join(envpath, 'src/rattail/.git/info/exclude'), use_sudo=True, owner=user) diff --git a/rattail_fabric2/byjove.py b/rattail_fabric2/byjove.py index ef4e814..60af4a6 100644 --- a/rattail_fabric2/byjove.py +++ b/rattail_fabric2/byjove.py @@ -33,7 +33,7 @@ def install_from_source(c, user='rattail'): """ if not exists(c, '/usr/local/src/byjove'): mkdir(c, '/usr/local/src/byjove', use_sudo=True, owner=user) - c.sudo('git clone https://forgejo.wuttaproject.org/rattail/byjove.git /usr/local/src/byjove', + c.sudo('git clone https://kallithea.rattailproject.org/rattail-project/byjove /usr/local/src/byjove', user=user) c.sudo("bash -l -c 'cd /usr/local/src/byjove; npm link'", user=user) diff --git a/rattail_fabric2/rattail.py b/rattail_fabric2/rattail.py index 3094cf7..2c59994 100644 --- a/rattail_fabric2/rattail.py +++ b/rattail_fabric2/rattail.py @@ -108,14 +108,6 @@ def delete_email_recipients(c, dbname): """ Purge all email recipient settings for the given database. """ - # purge new-style for wuttjamaican - postgresql.sql(c, "delete from setting where name like 'rattail.email.%.sender';", database=dbname) - postgresql.sql(c, "delete from setting where name like 'rattail.email.%.to';", database=dbname) - postgresql.sql(c, "delete from setting where name like 'rattail.email.%.cc';", database=dbname) - postgresql.sql(c, "delete from setting where name like 'rattail.email.%.bcc';", database=dbname) - - # purge old-style for rattail - postgresql.sql(c, "delete from setting where name like 'rattail.mail.%.from';", database=dbname) postgresql.sql(c, "delete from setting where name like 'rattail.mail.%.to';", database=dbname) postgresql.sql(c, "delete from setting where name like 'rattail.mail.%.cc';", database=dbname) postgresql.sql(c, "delete from setting where name like 'rattail.mail.%.bcc';", database=dbname)