Merge branch 'master' into filter_buttons

.gitea/workflows/deploy_stage.yml

@@ -0,0 +1,19 @@
+name: Deploy into stage environment
+on:
+  push:
+    branches:
+      - stage
+  workflow_dispatch:
+
+jobs:
+  make-deploy:
+    name: Deploy into stage environment
+    runs-on: [django-dav-events, kitty]
+    steps:
+      - name: "Checkout stage branch of the repository"
+        run: git clone -b stage "${{ gitea.server_url }}/${{ gitea.repository }}" ./repository
+      - name: "Run make deploy"
+        working-directory: ./repository
+        env:
+          DEPLOY_DIR: "/var/www/touren.alpenverein-karlsruhe.de/wsgi/django-dav-events.stage"
+        run: make deploy

.gitea/workflows/nightly_test.yml

@@ -0,0 +1,15 @@
+name: Run tests every night at 05:05
+on:
+  schedule:
+    - cron: "05 05 * * *"
+
+jobs:
+  run-tests:
+    name: Execute tox to run the test suite
+    runs-on: [django-dav-events]
+    steps:
+      - name: "Checkout the repository"
+        run: git clone "${{ gitea.server_url }}/${{ gitea.repository }}" ./repository
+      - name: "Run test via tox"
+        working-directory: ./repository
+        run: tox

.gitea/workflows/test_on_push.yml

@@ -0,0 +1,13 @@
+name: Run tests
+on: [push]
+
+jobs:
+  run-tests:
+    name: Execute tox to run the test suite
+    runs-on: [django-dav-events]
+    steps:
+      - name: "Checkout the repository"
+        run: git clone "${{ gitea.server_url }}/${{ gitea.repository }}" ./repository
+      - name: "Run tests via tox"
+        working-directory: ./repository
+        run: tox

dav_events/tests/test_converters.py

@@ -51,7 +51,7 @@ class Iso8601SerializerTestCase(TestCase):
         for value in invalid_values:
             emsg = ('Expected datetime.datetime, datetime.date or datetime.time,'
                     ' not {}'.format(value.__class__.__name__))
-            with self.assertRaisesRegexp(ValueError, emsg):
+            with self.assertRaisesRegex(ValueError, emsg):
                 Iso8601Serializer.serialize(value)
             serialized = Iso8601Serializer.serialize(value, ignore_unsupported_input=True)
             self.assertEqual(serialized, value)

setup.py

@@ -21,14 +21,16 @@ class SetupPythonEnvironment(MyCommand):
 
     def run(self):
         python_bin = sys.executable if sys.executable else 'python'
-        python_ver = sys.version_info.major
-        if python_ver == 3:
-            path = os.path.join('env', 'python3')
+        python_major_ver = sys.version_info.major
+        python_minor_ver = sys.version_info.minor
+        if python_major_ver == 3:
+            dirname = 'python%i.%i' % (python_major_ver, python_minor_ver)
+            path = os.path.join('env', dirname)
             symlink_path = os.path.join('env', 'python')
             venv_module = 'venv'
-            prompt = 'py3-dav'
+            prompt = 'py%i.%i-dav' % (python_major_ver, python_minor_ver)
         else:
-            sys.stderr.write('Python %d is not supported.\n' % python_ver)
+            sys.stderr.write('Python %d is not supported.\n' % python_major_ver)
             sys.exit(posix.EX_USAGE)
 
         print('Creating new python environment in {path}'.format(path=path))
@@ -119,6 +121,7 @@ setup(
         'django-datetime-widget2',
         'pytz',
         'selenium',
+        'setuptools',
         'coverage',
     ],
     extras_require={

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py311
+envlist = py311, py312
 
 [testenv]
 recreate = false