From d8c834095b4f2afb829dd47ce224f14001ce7ceb Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 26 Jan 2025 17:50:00 -0600 Subject: [PATCH 1/2] feat: add pkg extras for postgres, mysql; update install doc no longer requires psycopg2 by default; use postgres extra --- docs/narr/install.rst | 36 ++++++++++++++++++++++++++---------- pyproject.toml | 3 ++- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/docs/narr/install.rst b/docs/narr/install.rst index 68ded40..5d2cd2c 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -8,22 +8,34 @@ Prerequisites ------------- You'll need Python >= 3.8, and a database. See also -:doc:`wuttjamaican:narr/install/prereqs` in the Wutta docs. +the Wutta docs: + +* :doc:`wuttjamaican:narr/install/prereqs` +* :ref:`wuttjamaican:create-appdb` + +But for convenience here is a cheat sheet: + +*PostgreSQL* .. code-block:: sh sudo apt install build-essential python3-dev python3-venv postgresql libpq-dev -As for the database, see also :ref:`wuttjamaican:create-appdb` but FYI -these docs will assume a PostgreSQL setup with ``sideshow`` as the DB -name (and PG username). - -.. code-block:: sh - sudo -u postgres createuser sideshow sudo -u postgres psql -c "ALTER USER sideshow PASSWORD 'mypassword'" sudo -u postgres createdb -O sideshow sideshow +*MySQL* + +.. code-block:: sh + + sudo apt install build-essential python3-dev python3-venv default-mysql-server + + sudo mysql -e "CREATE USER sideshow@localhost" + sudo mysql -e "ALTER USER sideshow@localhost IDENTIFIED BY 'mypassword'" + sudo mysqladmin create sideshow + sudo mysql -e "GRANT ALL ON sideshow.* TO sideshow@localhost" + Virtual Environment ------------------- @@ -49,12 +61,16 @@ the folder ownership should be changed to whatever you need: Install Sideshow ---------------- -First install the Sideshow package to your virtual environment: +First install the Sideshow package to your virtual environment. Note +that you must specify which DB backend to use: .. code-block:: sh - cd /srv/envs/sideshow - bin/pip install Sideshow + # postgres + bin/pip install Sideshow[postgres] + + # mysql + bin/pip install Sideshow[mysql] Then you can run the Sideshow installer: diff --git a/pyproject.toml b/pyproject.toml index 5b65704..807fc7d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,11 +32,12 @@ classifiers = [ license = {text = "GNU General Public License v3+"} requires-python = ">= 3.8" dependencies = [ - "psycopg2", "WuttaWeb>=0.20.5", ] [project.optional-dependencies] +postgres = ["psycopg2"] +mysql = ["mysql-connector-python"] docs = ["Sphinx", "furo", "sphinxcontrib-programoutput", "enum-tools[sphinx]"] tests = ["pytest-cov", "tox"] From 76075f146ce251608cfc54fb94ce0be332e2849d Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 26 Jan 2025 17:52:16 -0600 Subject: [PATCH 2/2] =?UTF-8?q?bump:=20version=200.4.0=20=E2=86=92=200.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 12 ++++++++++++ pyproject.toml | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3945002..e69cde0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## v0.5.0 (2025-01-26) + +### Feat + +- add pkg extras for postgres, mysql; update install doc +- allow basic support for item discounts + +### Fix + +- add setup hook to auto-create Order Admin role +- bugfix for view order item page template + ## v0.4.0 (2025-01-23) ### Feat diff --git a/pyproject.toml b/pyproject.toml index 807fc7d..e1d42a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "hatchling.build" [project] name = "Sideshow" -version = "0.4.0" +version = "0.5.0" description = "Case/Special Order Tracker" readme = "README.md" authors = [ @@ -32,7 +32,7 @@ classifiers = [ license = {text = "GNU General Public License v3+"} requires-python = ">= 3.8" dependencies = [ - "WuttaWeb>=0.20.5", + "WuttaWeb>=0.20.6", ] [project.optional-dependencies]