From 243f8897253275325e25770a65a41380fce70164 Mon Sep 17 00:00:00 2001
From: Freyja Odinthrir <freyja@raer.me>
Date: Sat, 26 Oct 2024 00:59:25 -0700
Subject: [PATCH] Update workflow, bump version, update changelog

---
 .gitea/workflows/python-package.yaml | 25 ++++++++++++-------------
 CHANGELOG.md                         |  5 +++++
 blag/version.py                      |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/python-package.yaml b/.gitea/workflows/python-package.yaml
index bbf910a..5092000 100644
--- a/.gitea/workflows/python-package.yaml
+++ b/.gitea/workflows/python-package.yaml
@@ -50,19 +50,18 @@ jobs:
     - run: |
         make venv
     - run: |
-        make mypy
-
-
-  test-release:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: https://github.com/actions/checkout@v4
-    - uses: https://github.com/actions/setup-python@v5
-      with:
-        python-version: "3.11"
-
+        make test
     - run: |
-        make venv
+        make lint
+    - run: |
+        make mypy
     - run: |
         make test-release
+    -
+      name: Upload to PyPI
+      env:
+        TWINE_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.REGISTRY_TOKEN }}
+        TWINE_REPOSITORY_URL: "https://gitea.raer.me/api/packages/freyjagp/pypi"
+      run: |
+        pipenv run python3 -m twine upload --verbose dist/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d61a37..0f92d41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
 
+## [2.4.0] -- 2024-10-26
+
+* Merged master (original dev's work) into main (my fork)
+* update gitea workflow to hopefully build/push any updates made to my fork of blag.
+
 ## [2.4.0] -- 2024-09-05
 
 * added strikethru and footnotes to blag renders.
diff --git a/blag/version.py b/blag/version.py
index d3886f5..4e6cedd 100644
--- a/blag/version.py
+++ b/blag/version.py
@@ -1,3 +1,3 @@
 """Version information for the blag package."""
 
-__VERSION__ = "2.4.0"
+__VERSION__ = "2.4.1"