diff --git a/.python-version b/.python-version index 61d93e0..91e0b50 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -django-admin-confirm-3.8.0 +django-admin-confirm-3.9.9 diff --git a/docs/development_process.md b/docs/development_process.md index d0d6f68..67f7ed4 100644 --- a/docs/development_process.md +++ b/docs/development_process.md @@ -3,18 +3,16 @@ **Local:** _You can skip this and just use docker if you want_ -_NOTE: as of 2022-04-12 I don't know if 3.8.0 works anymore if you're on newer versions of macOS. See: https://github.com/pyenv/pyenv/issues/2143#issuecomment-1072032647 You can try using another version of python locally or use docker_ - Install pyenv -pyenv install 3.8.0 +pyenv install 3.9.9 Create **virtualenv** via pyenv ``` -pyenv virtualenv 3.8.0 django-admin-confirm-3.8.0 +pyenv virtualenv 3.9.9 django-admin-confirm-3.9.9 ``` -Now your terminal should have `(django-admin-confirm-3.8.0)` prefix, because `.python-version` should have auto switch your virtual env +Now your terminal should have `(django-admin-confirm-3.9.9)` prefix, because `.python-version` should have auto switch your virtual env Install requirements @@ -70,7 +68,7 @@ Localstack is used for integration testing and also in the test project. To check if localstack is running correctly, go to `http://localhost:4566` To check if the bucket has been set up correctly, go to `http://localhost:4566/mybucket` -To check if the static files have been set up correctly, go to `http://localhost:4566/mybucket/` +To check if the static files have been set up correctly, go to `http://localhost:4566/mybucket/static/admin/css/base.css` **Docker:** diff --git a/requirements.txt b/requirements.txt index 12069d0..dab2df2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,7 @@ readme-renderer~=28.0 twine~=3.3.0 coveralls~=3.0.0 Pillow~=8.1.0 # For ImageField +wheel~=0.37.1 ### SELENIUM ### # Known issue: https://github.com/SeleniumHQ/selenium/issues/8762 diff --git a/setup.py b/setup.py index dfc408a..11f3f46 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name="django-admin-confirm", - version="0.2.4", + version="0.2.5", packages=["admin_confirm"], description=("Adds confirmation to Django Admin changes, additions and actions"), long_description_content_type="text/markdown", diff --git a/tests/test_project/settings/base.py b/tests/test_project/settings/base.py index 9650130..51f6493 100644 --- a/tests/test_project/settings/base.py +++ b/tests/test_project/settings/base.py @@ -157,3 +157,5 @@ MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles") STATICFILES_DIRS = (os.path.join(BASE_DIR, "static"),) + +DEFAULT_AUTO_FIELD = "django.db.models.AutoField" diff --git a/tests/test_project/settings/local.py b/tests/test_project/settings/local.py index 865e254..b729df5 100644 --- a/tests/test_project/settings/local.py +++ b/tests/test_project/settings/local.py @@ -4,4 +4,6 @@ WSGI_APPLICATION = "test_project.wsgi.application" ROOT_URLCONF = "test_project.urls" -USE_S3 = "True" +if USE_S3: + STATICFILES_STORAGE = "storage_backends.StaticStorage" + DEFAULT_FILE_STORAGE = "storage_backends.PublicMediaStorage" diff --git a/tests/test_project/settings/test.py b/tests/test_project/settings/test.py index 0bfa80b..8518949 100644 --- a/tests/test_project/settings/test.py +++ b/tests/test_project/settings/test.py @@ -3,5 +3,3 @@ INSTALLED_APPS = INSTALLED_APPS + ["tests.market"] WSGI_APPLICATION = "tests.test_project.wsgi.application" ROOT_URLCONF = "tests.test_project.urls" - -USE_S3 = "True"