Merge pull request #370 from adamspd/fix-workflow-for-test-release

fix workflow publishing logic and package distribution issues

Author: adamspd

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: Publishing
 on:
   push:
     branches:
-      - main
+      - '*'
     tags:
       - '*'
   workflow_dispatch:
@@ -64,7 +64,8 @@ jobs:
           path: dist/*
 
       - name: Publish to PyPI
-        if: needs.prepare-and-check.outputs.publish_to_pypi == 'true'
+        # Only publish to PyPI on the main branch
+        if: needs.prepare-and-check.outputs.publish_to_pypi == 'true' && github.ref == 'refs/heads/main'
         run: twine upload dist/*
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
@@ -79,7 +80,8 @@ jobs:
 
   create-release:
     needs: [prepare-and-check, build-and-publish]
-    if: needs.prepare-and-check.outputs.publish_to_pypi == 'true'
+    # Only create GitHub releases for real PyPI publishes AND only on the main branch
+    if: needs.prepare-and-check.outputs.publish_to_pypi == 'true' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     permissions:
       id-token: write

appointment/__init__.py

@@ -6,5 +6,5 @@
 __url__ = "https://github.com/adamspd/django-appointment"
 __package_website__ = "https://django-appt.adamspierredavid.com/"
 __package_doc_url__ = "https://django-appt-doc.adamspierredavid.com/"
-__version__ = "3.9.0"
-__test_version__ = True
+__version__ = "3.9.1"
+__test_version__ = False

locale/fr/LC_MESSAGES/django.mo renamed to appointment/locale/fr/LC_MESSAGES/django.mo

@@ -131,7 +131,6 @@
 
 APPOINTMENT_BUFFER_TIME = 0
 
-LOCALE_PATHS = [os.path.join(BASE_DIR, "locale")]
 LANGUAGES = (
     ('en', _('English')),
     ('fr', _('French')),

locale/fr/LC_MESSAGES/django.po renamed to appointment/locale/fr/LC_MESSAGES/django.po

@@ -27,8 +27,14 @@ def check_package_version(package_name, current_version, github_ref_=None):
     publish_to_pypi = False
     publish_to_testpypi = False
 
-    # Determine if this is a test version based on the GitHub ref or __test_version__
-    is_test_version = "test" in github_ref_ if github_ref_ else __test_version__
+    # Determine if this is a test version - prioritize __test_version__ flag
+    if __test_version__:
+        is_test_version = True
+    elif github_ref_ and "test" in github_ref_:
+        is_test_version = True
+    else:
+        is_test_version = False
+
     pypi_url = "https://test.pypi.org/pypi/" if is_test_version else "https://pypi.org/pypi/"
 
     # Check if the current version exists on the respective PyPI repository

appointments/settings.py

@@ -1,4 +1,4 @@
-Django==5.1.7
+Django==5.2.2
 Pillow==11.3.0
 phonenumbers==9.0.12
 django-phonenumber-field==8.1.0

check_version.py

@@ -22,9 +22,10 @@ include_package_data = true
 packages = find:
 python_requires = >=3.8
 install_requires =
-    Django>=4.2
-    Pillow==10.4.0
-    phonenumbers==8.13.42
-    django-phonenumber-field==8.0.0
-    babel==2.15.0
-    colorama~=0.4.6
+    Django>=4.2,<6.0
+    Pillow~=10.4
+    phonenumbers~=8.13
+    django-phonenumber-field~=8.0
+    babel~=2.15
+    colorama~=0.4
+    icalendar~=6.3.1