From 811983abfea4f0f7bddf033dbfed89cb967e9b0f Mon Sep 17 00:00:00 2001 From: heinzel Date: Wed, 24 May 2023 09:47:38 +0200 Subject: [PATCH] Make tox work with python 3.11 --- MANIFEST.in | 3 --- dav_base/tests/utils.py | 11 ++++------- setup.py | 4 ++-- tests/test_suite.py | 3 ++- tox.ini | 7 +++++-- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index fa47c47..07a2b08 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,3 @@ -# common dist files -include README.rst INSTALL.rst -include setup.py requirements.txt # dav_base recursive-include dav_base/console_scripts/django_project_config *.py recursive-include dav_base/static * diff --git a/dav_base/tests/utils.py b/dav_base/tests/utils.py index 92bf16e..0355f82 100644 --- a/dav_base/tests/utils.py +++ b/dav_base/tests/utils.py @@ -4,10 +4,7 @@ import os from tempfile import mkdtemp as _mkdtemp -def mkdtemp(prefix): - dirname = os.path.dirname - pkg_base_dir = dirname(dirname(dirname(__file__))) - tmp_dir = os.path.join(pkg_base_dir, 'tmp') - if not os.path.exists(tmp_dir): - os.makedirs(tmp_dir) - return _mkdtemp(prefix=prefix, dir=tmp_dir) +def mkdtemp(prefix, base_dir): + if not os.path.exists(base_dir): + os.makedirs(base_dir) + return _mkdtemp(prefix=prefix, dir=base_dir) diff --git a/setup.py b/setup.py index 1a64cef..1d76df9 100644 --- a/setup.py +++ b/setup.py @@ -92,9 +92,9 @@ class QuickSetup(MyCommand): setup( name='django-dav-events', - version='2.1', + version='2.1.2', description='A django based web application project to organize DAV Events.', - url='https://touren.alpenverein-karlsruhe.de', + url='https://dev.heinzelwerk.de/git/DAV-KA/django-dav-events', author='Jens Kleineheismann', author_email='heinzel@alpenverein-karlsruhe.de', cmdclass={ diff --git a/tests/test_suite.py b/tests/test_suite.py index 4ca6bcb..8e9ea24 100644 --- a/tests/test_suite.py +++ b/tests/test_suite.py @@ -11,6 +11,7 @@ from dav_base.tests.utils import mkdtemp # from dav_base.console_scripts.admin import DJANGO_MAIN_MODULE DJANGO_MAIN_MODULE = 'main' +TMP_BASE_DIR = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'tmp') class DjangoEnvironment: @@ -42,7 +43,7 @@ class DjangoEnvironment: prefix = 'testrun-{datetime}-'.format( datetime=datetime.datetime.now().strftime('%Y%m%d-%H%M') ) - self.path = mkdtemp(prefix=prefix) + self.path = mkdtemp(prefix=prefix, base_dir=TMP_BASE_DIR) self._install_djangoproject(self.path, modules=self._enable_modules) diff --git a/tox.ini b/tox.ini index 4c6403c..bd6dda3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,10 @@ [tox] -envlist = py3 +envlist = py311 [testenv] +recreate = false +setenv = + PYTHONPATH = . commands = python --version - python -m coverage run tests/test_suite.py + python -m coverage run tests coverage report --skip-covered