Minor fixes (#38)

* Minor fixes

* Updated workflow and package build process

Author: adamspd

.github/workflows/publish.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine requests  # Added requests for the version check
+        pip install setuptools wheel twine requests build  # Added requests for the version check
 
     # Check if the current version is already on PyPI
     - name: Check version on PyPI
@@ -34,7 +34,7 @@ jobs:
     - name: Build package
       if: steps.version_check.outputs.version_exists != 'true'
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build
 
     - name: Upload to PyPI
       if: steps.version_check.outputs.version_exists != 'true'

MANIFEST.in

@@ -28,18 +28,14 @@ recursive-include appointment/static/css *.css
 recursive-include appointment/static/js *.js
 recursive-include appointment/static/img *.jpg
 recursive-include appointment/templates/ *.html
+recursive-include appointment/tests/base *.py
+recursive-include appointment/tests/mixins *.py
+recursive-include appointment/tests/models *.py
+recursive-include appointment/tests/utils *.py
 recursive-include appointment/tests *.py
 recursive-include appointment/utils *.py
 
 # Exclusions
-exclude release_notes.md
-exclude check_version.py
-exclude manage.py
-exclude db.sqlite3
-exclude .gitignore
-exclude .git
-exclude .svn
-exclude .hg
 exclude appointment/__pycache__
 exclude appointment/migrations/__pycache__
 

appointment/__init__.py

@@ -4,4 +4,4 @@
 __description__ = "Managing appointment scheduling with customizable slots, staff features, and conflict handling."
 __package_name__ = "django-appointment"
 __url__ = "https://github.com/adamspd/django-appointment"
-__version__ = "2.1.3"
+__version__ = "2.1.4"

appointment/admin.py

@@ -42,7 +42,8 @@ class EmailVerificationCodeAdmin(admin.ModelAdmin):
 
 @admin.register(Config)
 class ConfigAdmin(admin.ModelAdmin):
-    list_display = ('slot_duration', 'lead_time', 'finish_time', 'appointment_buffer_time', 'website_name')
+    list_display = (
+        'slot_duration', 'lead_time', 'finish_time', 'appointment_buffer_time', 'website_name', 'app_offered_by_label')
 
 
 # Define a custom ModelForm for StaffMember

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ['setuptools>=40.8.0', 'wheel']
+requires = ['setuptools>=61.0', 'wheel']
 build-backend = 'setuptools.build_meta:__legacy__'

requirements.txt

@@ -3,5 +3,5 @@ Pillow==10.1.0
 phonenumbers==8.13.25
 django-phonenumber-field==7.2.0
 babel==2.13.1
-setuptools==69.0.1
+setuptools==69.0.2
 pytz~=2023.3.post1

setup.cfg

@@ -17,8 +17,6 @@ classifiers =
     Topic :: Software Development :: Libraries :: Application Frameworks
 
 [options]
-include_package_data = true
-packages = find:
 python_requires = >=3.8
 install_requires =
     Django>=4.2

setup.py

@@ -18,4 +18,30 @@
     project_urls={
         "Author Website": __author_website__,
     },
+    packages=setuptools.find_packages(where="appointments"),
+    package_dir={"": "appointment"},
+    include_package_data=True,
+    package_data={
+        'appointment': [
+            'static/css/**/*.css',
+            'static/js/**/*.js',
+            'static/img/**/*.*',
+            'templates/**/*.html',
+        ],
+        'appointment.tests': [
+            'mixins/*',
+            'base/*',
+            'models/*',
+            'utils/*',
+            '*.py'
+        ],
+    },
+    exclude_package_data={
+        "appointment": [
+            "django_appointment.egg-info"
+        ],
+        "appointment.django_appointment": [
+            "egg-info",
+        ]
+    },
 )