Compare commits

...

4 commits

10 changed files with 38 additions and 42 deletions

View file

@ -1,6 +1,5 @@
tailbone-theo # tailbone-theo
=============
This is an experimental project, as of this writing. Its purpose is 2-fold: 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 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. some point, we'll see. Nobody should be holding their breath maybe.
See the `Rattail Project`_ for more info. See the [Rattail Project](https://rattailproject.org/) for more info.
.. _`Rattail Project`: https://rattailproject.org/

View file

@ -40,7 +40,7 @@ extensions = [
] ]
intersphinx_mapping = { 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. # Add any paths that contain templates here, relative to this directory.

View file

@ -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 Usually there are also some POS integration packages involved; see
:ref:`pos-integration` for links to those. :ref:`pos-integration` for links to those.
Source code for *all* packages is hosted on the rattailproject.org Source code for *all* packages is hosted on
server, specifically under https://kallithea.rattailproject.org/ https://forgejo.wuttaproject.org/rattail/
You can request an account there, and then "fork" anything as you You can request an account there, and then "fork" anything as you
like. Or skip the account and just clone whatever. like. Or skip the account and just clone whatever.

View file

@ -28,9 +28,9 @@ you just want the latest releases:
Or if you want to run from source then you can clone/install these: Or if you want to run from source then you can clone/install these:
* https://kallithea.rattailproject.org/rattail-project/pycorepos * https://forgejo.wuttaproject.org/rattail/pycorepos
* https://kallithea.rattailproject.org/rattail-project/rattail-corepos * https://forgejo.wuttaproject.org/rattail/rattail-corepos
* https://kallithea.rattailproject.org/rattail-project/tailbone-corepos * https://forgejo.wuttaproject.org/rattail/tailbone-corepos
But then just in case, do also run the above command as well, to But then just in case, do also run the above command as well, to
ensure all dependencies are got. ensure all dependencies are got.

View file

@ -80,9 +80,9 @@ e.g.::
Then clone any packages you don't yet have, 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://forgejo.wuttaproject.org/rattail/rattail.git
git clone https://kallithea.rattailproject.org/rattail-project/tailbone git clone https://forgejo.wuttaproject.org/rattail/tailbone.git
git clone https://kallithea.rattailproject.org/rattail-project/theo git clone https://forgejo.wuttaproject.org/rattail/theo.git
Finally install all packages to your virtual environment, e.g.:: 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 We'll do the more complicated ones first. You can grab copies of them
from Theo source code: from Theo source code:
* `rattail.conf <https://kallithea.rattailproject.org/rattail-project/theo/rawfile/master/dev/rattail.conf>`_ * `rattail.conf <https://forgejo.wuttaproject.org/rattail/theo/src/branch/master/dev/rattail.conf>`_
* `web.conf <https://kallithea.rattailproject.org/rattail-project/theo/rawfile/master/dev/web.conf>`_ * `web.conf <https://forgejo.wuttaproject.org/rattail/theo/src/branch/master/dev/web.conf>`_
Put each copy in your Theo "app" folder and edit as needed, in Put each copy in your Theo "app" folder and edit as needed, in
particular replacing ``<ENVDIR>`` and similar strings (e.g. ``<SEP>`` particular replacing ``<ENVDIR>`` and similar strings (e.g. ``<SEP>``

View file

@ -11,7 +11,7 @@ Clone the source code for Theo wherever you like, e.g. ``~/src/theo``::
mkdir -p ~/src mkdir -p ~/src
cd ~/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``) Your local PostgreSQL service should be available, and user (named ``rattail``)
and DB (named ``theo``) created:: and DB (named ``theo``) created::

View file

@ -72,11 +72,11 @@ env.restricted_pypi_username = 'username'
env.restricted_pypi_password = 'password' env.restricted_pypi_password = 'password'
# these credentials are used to access the Rattail Project source code on # 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 # you are integrating with a proprietary POS system, and running from source
# instead of released packages; i.e. a typical stage setup. # instead of released packages; i.e. a typical stage setup.
env.kallithea_username = 'username' env.forgejo_username = 'username'
env.kallithea_password = 'password' env.forgejo_password = 'password'
############################## ##############################

View file

@ -47,6 +47,10 @@ def bootstrap_base(c):
# rattail user + common config # rattail user + common config
make_system_user(c, 'rattail', home='/var/lib/rattail', shell='/bin/bash') make_system_user(c, 'rattail', home='/var/lib/rattail', shell='/bin/bash')
postfix.alias(c, 'rattail', 'root') 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) mkdir(c, '/etc/rattail', use_sudo=True)
deploy(c, 'rattail/rattail.conf.mako', '/etc/rattail/rattail.conf', deploy(c, 'rattail/rattail.conf.mako', '/etc/rattail/rattail.conf',
use_sudo=True, context={'env': env}) use_sudo=True, context={'env': env})
@ -313,30 +317,25 @@ def install_theo_source(c, envroot):
# catapult # catapult
elif env.theo_integrates_with == 'catapult': elif env.theo_integrates_with == 'catapult':
install_source_package(c, envroot, 'onager', restricted=True) install_source_package(c, envroot, 'onager')
install_source_package(c, envroot, 'rattail-onager', restricted=True) install_source_package(c, envroot, 'rattail-onager')
install_source_package(c, envroot, 'tailbone-onager', restricted=True) install_source_package(c, envroot, 'tailbone-onager')
# locsms # locsms
elif env.theo_integrates_with == 'locsms': elif env.theo_integrates_with == 'locsms':
install_source_package(c, envroot, 'luckysmores', restricted=True) install_source_package(c, envroot, 'luckysmores')
install_source_package(c, envroot, 'rattail-luckysmores', restricted=True) install_source_package(c, envroot, 'rattail-luckysmores')
install_source_package(c, envroot, 'tailbone-locsms', restricted=True) install_source_package(c, envroot, 'tailbone-locsms')
# theo # theo
install_source_package(c, envroot, '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 not exists(c, '{}/src/{}'.format(envroot, name)):
if restricted: c.sudo(f'git clone https://forgejo.wuttaproject.org/rattail/{name} {envroot}/src/{name}',
c.sudo('git clone https://{0}:{1}@kallithea.rattailproject.org/rattail-restricted/{2} {3}/src/{2}'.format( user='rattail')
env.kallithea_username, env.kallithea_password, name, envroot), c.sudo(f"bash -c 'PIP_CONFIG_FILE={envroot}/pip.conf cd {envroot} && bin/pip install -e src/{name}'",
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),
user='rattail') user='rattail')

View file

@ -8,7 +8,7 @@ build-backend = "hatchling.build"
name = "tailbone-theo" name = "tailbone-theo"
version = "0.2.3" version = "0.2.3"
description = "Theo, the order system" description = "Theo, the order system"
readme = "README.rst" readme = "README.md"
authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] authors = [{name = "Lance Edgar", email = "lance@edbob.org"}]
license = {text = "GNU GPL v3+"} license = {text = "GNU GPL v3+"}
classifiers = [ classifiers = [
@ -66,10 +66,10 @@ theo = "theo.config:TheoConfig"
[project.urls] [project.urls]
Homepage = "https://redmine.rattailproject.org/projects/theo" Homepage = "https://rattailproject.org"
Repository = "https://kallithea.rattailproject.org/rattail-project/theo" Repository = "https://forgejo.wuttaproject.org/rattail/theo"
Issues = "https://redmine.rattailproject.org/projects/theo/issues" Issues = "https://forgejo.wuttaproject.org/rattail/theo/issues"
Changelog = "https://kallithea.rattailproject.org/rattail-project/theo/files/master/CHANGELOG.md" Changelog = "https://forgejo.wuttaproject.org/rattail/theo/src/branch/master/CHANGELOG.md"
[tool.commitizen] [tool.commitizen]

View file

@ -24,10 +24,10 @@
Configuration for Theo Configuration for Theo
""" """
from rattail.config import ConfigExtension from wuttjamaican.conf import WuttaConfigExtension
class TheoConfig(ConfigExtension): class TheoConfig(WuttaConfigExtension):
""" """
Rattail config extension for Theo Rattail config extension for Theo
""" """