From cec319e6fe1fea10be77196798c637e4a88a5690 Mon Sep 17 00:00:00 2001
From: Dylan Verheul <dylan@dyve.net>
Date: Sun, 24 Dec 2023 10:14:13 +0100
Subject: [PATCH] Update package structure

---
 .github/workflows/test.yml  | 1 -
 .readthedocs.yml            | 1 -
 Makefile                    | 2 +-
 docs/conf.py                | 5 +----
 requirements-dev.txt        | 2 +-
 src/bootstrap4/__about__.py | 2 +-
 tests/test_forms.py         | 4 +---
 tests/test_paginator.py     | 4 +---
 8 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 346631c0..7b82f668 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -84,7 +84,6 @@ jobs:
       - name: Install and build
         run: |
           python -m pip install -r docs/requirements.txt
-          python -m pip install -e .
           make docs
 
   tests:
diff --git a/.readthedocs.yml b/.readthedocs.yml
index b9870409..a34d6434 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -7,6 +7,5 @@ build:
   commands:
     - pip install -U pip
     - pip install -U -r docs/requirements.txt
-    - pip install -e .
     - make docs
     - mv docs/_build $READTHEDOCS_OUTPUT
diff --git a/Makefile b/Makefile
index 27d4e898..cb64d796 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION := $(shell python -c "import bootstrap4;print(bootstrap4.__version__)")
+VERSION := $(shell sed -n 's/^ *version.*=.*"\([^"]*\)".*/\1/p' pyproject.toml)
 
 .PHONY: test
 test:
diff --git a/docs/conf.py b/docs/conf.py
index 859f96f2..46810fd5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,15 +1,12 @@
-import importlib
 from datetime import datetime
 
 import tomllib
 
-module = importlib.import_module("bootstrap4")
-
 with open("../pyproject.toml", "rb") as f:
     pyproject = tomllib.load(f)
 
 project = pyproject["project"]["name"]
-release = module.__version__
+release = pyproject["project"]["version"]
 version = ".".join(release.split(".")[:2])
 author = ", ".join(author["name"] for author in pyproject["project"]["authors"])
 year = datetime.now().year
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 85514cc9..9c8d1209 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,3 +1,3 @@
 -r requirements-test.txt
 -r docs/requirements.txt
-django==5.0
+twine==4.0.2
diff --git a/src/bootstrap4/__about__.py b/src/bootstrap4/__about__.py
index 961690fa..68ff86d0 100644
--- a/src/bootstrap4/__about__.py
+++ b/src/bootstrap4/__about__.py
@@ -1 +1 @@
-__version__ = "23.3.dev0"
+__version__ = "23.3.dev1"
diff --git a/tests/test_forms.py b/tests/test_forms.py
index 8c28d779..b181cb0f 100644
--- a/tests/test_forms.py
+++ b/tests/test_forms.py
@@ -154,9 +154,7 @@ def test_input_group_addon_button(self):
         self.assertIn('<div class="input-group-append">.00</div>', res)
 
     def test_input_group_addon_empty(self):
-        res = render_template_with_form(
-            '{% bootstrap_field form.subject addon_before=None addon_after="after" %}'
-        )  # noqa
+        res = render_template_with_form('{% bootstrap_field form.subject addon_before=None addon_after="after" %}')  # noqa
         self.assertIn('class="input-group"', res)
         self.assertNotIn("input-group-prepend", res)
         self.assertIn('<div class="input-group-append"><span class="input-group-text">after</span></div>', res)
diff --git a/tests/test_paginator.py b/tests/test_paginator.py
index 9a45dc69..a956f3cc 100644
--- a/tests/test_paginator.py
+++ b/tests/test_paginator.py
@@ -17,9 +17,7 @@ def bootstrap_pagination(self, page, extra=""):
         template = """
             {% load bootstrap4 %}
             {% bootstrap_pagination page {extra} %}
-        """.replace(
-            "{extra}", extra
-        )
+        """.replace("{extra}", extra)
 
         return render_template(template, {"page": page})