diff --git a/CHANGELOG.md b/CHANGELOG.md index e69cde0..3945002 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,3 @@ -## 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/docs/narr/install.rst b/docs/narr/install.rst index 5d2cd2c..68ded40 100644 --- a/docs/narr/install.rst +++ b/docs/narr/install.rst @@ -8,33 +8,21 @@ Prerequisites ------------- You'll need Python >= 3.8, and a database. See also -the Wutta docs: - -* :doc:`wuttjamaican:narr/install/prereqs` -* :ref:`wuttjamaican:create-appdb` - -But for convenience here is a cheat sheet: - -*PostgreSQL* +:doc:`wuttjamaican:narr/install/prereqs` in the Wutta docs. .. code-block:: sh sudo apt install build-essential python3-dev python3-venv postgresql libpq-dev - sudo -u postgres createuser sideshow - sudo -u postgres psql -c "ALTER USER sideshow PASSWORD 'mypassword'" - sudo -u postgres createdb -O sideshow sideshow - -*MySQL* +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 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" + sudo -u postgres createuser sideshow + sudo -u postgres psql -c "ALTER USER sideshow PASSWORD 'mypassword'" + sudo -u postgres createdb -O sideshow sideshow Virtual Environment @@ -61,16 +49,12 @@ the folder ownership should be changed to whatever you need: Install Sideshow ---------------- -First install the Sideshow package to your virtual environment. Note -that you must specify which DB backend to use: +First install the Sideshow package to your virtual environment: .. code-block:: sh - # postgres - bin/pip install Sideshow[postgres] - - # mysql - bin/pip install Sideshow[mysql] + cd /srv/envs/sideshow + bin/pip install Sideshow Then you can run the Sideshow installer: diff --git a/pyproject.toml b/pyproject.toml index e1d42a8..5b65704 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "hatchling.build" [project] name = "Sideshow" -version = "0.5.0" +version = "0.4.0" description = "Case/Special Order Tracker" readme = "README.md" authors = [ @@ -32,12 +32,11 @@ classifiers = [ license = {text = "GNU General Public License v3+"} requires-python = ">= 3.8" dependencies = [ - "WuttaWeb>=0.20.6", + "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"]