diff --git a/README.rst b/README.md similarity index 75% rename from README.rst rename to README.md index 53f243e..582ce1d 100644 --- a/README.rst +++ b/README.md @@ -1,6 +1,5 @@ -tailbone-theo -============= +# tailbone-theo This is an experimental project, as of this writing. Its purpose is 2-fold: @@ -10,6 +9,4 @@ This is an experimental project, as of this writing. Its purpose is 2-fold: This may also attempt certain aspects of "curbside" and/or "delivery" orders at some point, we'll see. Nobody should be holding their breath maybe. -See the `Rattail Project`_ for more info. - -.. _`Rattail Project`: https://rattailproject.org/ +See the [Rattail Project](https://rattailproject.org/) for more info. diff --git a/docs/conf.py b/docs/conf.py index 8e3f7d6..9490f03 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -40,7 +40,7 @@ extensions = [ ] intersphinx_mapping = { - 'rattail-manual': ('https://rattailproject.org/docs/rattail-manual/', None), + 'rattail-manual': ('https://docs.wuttaproject.org/rattail-manual/', None), } # Add any paths that contain templates here, relative to this directory. diff --git a/docs/develop.rst b/docs/develop.rst index 25e8f82..0d73f10 100644 --- a/docs/develop.rst +++ b/docs/develop.rst @@ -12,8 +12,8 @@ Rattail and Tailbone are the 2 main packages, responsible for the Usually there are also some POS integration packages involved; see :ref:`pos-integration` for links to those. -Source code for *all* packages is hosted on the rattailproject.org -server, specifically under https://kallithea.rattailproject.org/ +Source code for *all* packages is hosted on +https://forgejo.wuttaproject.org/rattail/ You can request an account there, and then "fork" anything as you like. Or skip the account and just clone whatever. diff --git a/docs/install/integration.rst b/docs/install/integration.rst index 9488786..b040036 100644 --- a/docs/install/integration.rst +++ b/docs/install/integration.rst @@ -28,9 +28,9 @@ you just want the latest releases: Or if you want to run from source then you can clone/install these: -* https://kallithea.rattailproject.org/rattail-project/pycorepos -* https://kallithea.rattailproject.org/rattail-project/rattail-corepos -* https://kallithea.rattailproject.org/rattail-project/tailbone-corepos +* https://forgejo.wuttaproject.org/rattail/pycorepos +* https://forgejo.wuttaproject.org/rattail/rattail-corepos +* https://forgejo.wuttaproject.org/rattail/tailbone-corepos But then just in case, do also run the above command as well, to ensure all dependencies are got. diff --git a/docs/install/manual.rst b/docs/install/manual.rst index 2cb3dc2..680e355 100644 --- a/docs/install/manual.rst +++ b/docs/install/manual.rst @@ -80,9 +80,9 @@ e.g.:: Then clone any packages you don't yet have, e.g.:: - git clone https://kallithea.rattailproject.org/rattail-project/rattail - git clone https://kallithea.rattailproject.org/rattail-project/tailbone - git clone https://kallithea.rattailproject.org/rattail-project/theo + git clone https://forgejo.wuttaproject.org/rattail/rattail.git + git clone https://forgejo.wuttaproject.org/rattail/tailbone.git + git clone https://forgejo.wuttaproject.org/rattail/theo.git Finally install all packages to your virtual environment, e.g.:: @@ -122,8 +122,8 @@ just made above. We'll do the more complicated ones first. You can grab copies of them from Theo source code: -* `rattail.conf `_ -* `web.conf `_ +* `rattail.conf `_ +* `web.conf `_ Put each copy in your Theo "app" folder and edit as needed, in particular replacing ```` and similar strings (e.g. ```` diff --git a/docs/quickstart.rst b/docs/quickstart.rst index ddc0da0..a95d60b 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -11,7 +11,7 @@ Clone the source code for Theo wherever you like, e.g. ``~/src/theo``:: mkdir -p ~/src cd ~/src - git clone https://kallithea.rattailproject.org/rattail-project/theo + git clone https://forgejo.wuttaproject.org/rattail/theo.git Your local PostgreSQL service should be available, and user (named ``rattail``) and DB (named ``theo``) created:: diff --git a/machines/theo-server/fabenv.py.dist b/machines/theo-server/fabenv.py.dist index 8f37552..f383c1f 100644 --- a/machines/theo-server/fabenv.py.dist +++ b/machines/theo-server/fabenv.py.dist @@ -72,11 +72,11 @@ env.restricted_pypi_username = 'username' env.restricted_pypi_password = 'password' # these credentials are used to access the Rattail Project source code on -# Kallithea (https://kallithea.rattailproject.org/). they are only needed if +# Forgejo (https://forgejo.wuttaproject.org/rattail/). they are only needed if # you are integrating with a proprietary POS system, and running from source # instead of released packages; i.e. a typical stage setup. -env.kallithea_username = 'username' -env.kallithea_password = 'password' +env.forgejo_username = 'username' +env.forgejo_password = 'password' ############################## diff --git a/machines/theo-server/fabfile.py b/machines/theo-server/fabfile.py index 3cab74b..2cad240 100644 --- a/machines/theo-server/fabfile.py +++ b/machines/theo-server/fabfile.py @@ -47,6 +47,10 @@ def bootstrap_base(c): # rattail user + common config make_system_user(c, 'rattail', home='/var/lib/rattail', shell='/bin/bash') postfix.alias(c, 'rattail', 'root') + # c.sudo('git config --global credential.helper store', + # user='rattail') + # c.sudo('git config --global credential.https://forgejo.wuttaproject.org.username MYUSERNAME', + # user='rattail') mkdir(c, '/etc/rattail', use_sudo=True) deploy(c, 'rattail/rattail.conf.mako', '/etc/rattail/rattail.conf', use_sudo=True, context={'env': env}) @@ -313,30 +317,25 @@ def install_theo_source(c, envroot): # catapult elif env.theo_integrates_with == 'catapult': - install_source_package(c, envroot, 'onager', restricted=True) - install_source_package(c, envroot, 'rattail-onager', restricted=True) - install_source_package(c, envroot, 'tailbone-onager', restricted=True) + install_source_package(c, envroot, 'onager') + install_source_package(c, envroot, 'rattail-onager') + install_source_package(c, envroot, 'tailbone-onager') # locsms elif env.theo_integrates_with == 'locsms': - install_source_package(c, envroot, 'luckysmores', restricted=True) - install_source_package(c, envroot, 'rattail-luckysmores', restricted=True) - install_source_package(c, envroot, 'tailbone-locsms', restricted=True) + install_source_package(c, envroot, 'luckysmores') + install_source_package(c, envroot, 'rattail-luckysmores') + install_source_package(c, envroot, 'tailbone-locsms') # theo install_source_package(c, envroot, 'theo') -def install_source_package(c, envroot, name, restricted=False): +def install_source_package(c, envroot, name): if not exists(c, '{}/src/{}'.format(envroot, name)): - if restricted: - c.sudo('git clone https://{0}:{1}@kallithea.rattailproject.org/rattail-restricted/{2} {3}/src/{2}'.format( - env.kallithea_username, env.kallithea_password, name, envroot), - user='rattail', echo=False) - else: - c.sudo('git clone https://kallithea.rattailproject.org/rattail-project/{0} {1}/src/{0}'.format(name, envroot), - user='rattail') - c.sudo("bash -c 'PIP_CONFIG_FILE={0}/pip.conf cd {0} && bin/pip install -e src/{1}'".format(envroot, name), + c.sudo(f'git clone https://forgejo.wuttaproject.org/rattail/{name} {envroot}/src/{name}', + user='rattail') + c.sudo(f"bash -c 'PIP_CONFIG_FILE={envroot}/pip.conf cd {envroot} && bin/pip install -e src/{name}'", user='rattail') diff --git a/pyproject.toml b/pyproject.toml index f9dfbcd..05b3a36 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "hatchling.build" name = "tailbone-theo" version = "0.2.3" description = "Theo, the order system" -readme = "README.rst" +readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] license = {text = "GNU GPL v3+"} classifiers = [ @@ -66,10 +66,10 @@ theo = "theo.config:TheoConfig" [project.urls] -Homepage = "https://redmine.rattailproject.org/projects/theo" -Repository = "https://kallithea.rattailproject.org/rattail-project/theo" -Issues = "https://redmine.rattailproject.org/projects/theo/issues" -Changelog = "https://kallithea.rattailproject.org/rattail-project/theo/files/master/CHANGELOG.md" +Homepage = "https://rattailproject.org" +Repository = "https://forgejo.wuttaproject.org/rattail/theo" +Issues = "https://forgejo.wuttaproject.org/rattail/theo/issues" +Changelog = "https://forgejo.wuttaproject.org/rattail/theo/src/branch/master/CHANGELOG.md" [tool.commitizen] diff --git a/theo/config.py b/theo/config.py index 7842e17..57b081a 100644 --- a/theo/config.py +++ b/theo/config.py @@ -24,10 +24,10 @@ Configuration for Theo """ -from rattail.config import ConfigExtension +from wuttjamaican.conf import WuttaConfigExtension -class TheoConfig(ConfigExtension): +class TheoConfig(WuttaConfigExtension): """ Rattail config extension for Theo """