Merge pull request #95 from amorilla/master

Update setup

Author: amorilla

.github/workflows/python-publish.yml

@@ -19,7 +19,7 @@ permissions:
 
 jobs:
   pypi-publish:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     permissions:
       id-token: write
     steps:
@@ -30,11 +30,11 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v3
       with:
-          python-version: 3.10
+          python-version: 3.12
     - name: Install dependencies
       run: |
         python -m pip install -U pip
-        python -m pip install -U django django-storages boto3 wheel
+        python -m pip install -U django django-storages boto3 wheel setuptools
 
     - name: Build package
       run: |
@@ -44,7 +44,6 @@ jobs:
     - name: Publish package
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        user: __token__
-        password: ${{ secrets.PYPI_API_TOKEN }}
+        verbose: true
         repository-url: https://upload.pypi.org/legacy/
 

.github/workflows/test-python-publish.yml

@@ -19,7 +19,7 @@ permissions:
 
 jobs:
   pypi-publish:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     permissions:
       id-token: write
     steps:
@@ -30,11 +30,11 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v3
       with:
-          python-version: 3.10
+          python-version: 3.12
     - name: Install dependencies
       run: |
         python -m pip install -U pip
-        python -m pip install -U django django-storages boto3 wheel
+        python -m pip install -U django django-storages boto3 wheel setuptools
 
     - name: Build package
       run: |
@@ -44,7 +44,6 @@ jobs:
     - name: Publish package
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        user: __token__
-        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+        verbose: true
         repository-url: https://test.pypi.org/legacy/
 

.github/workflows/tests.yaml

@@ -10,30 +10,27 @@ on:
 jobs:
   test:
     name: "Python ${{ matrix.python }} Django ${{ matrix.django }}"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       # max-parallel: 8  # default is max available
       fail-fast: false
       matrix:
         include:
           # Django 2.2
           - django: "2.2"
-            python: "3.6"
-          # Django 3.1
-          - django: "3.1"
-            python: "3.6"
+            python: "3.8"
           # Django 3.2
           - django: "3.2"
-            python: "3.6"
-          # Django 4.0
-          - django: "4.0"
-            python: "3.10"
-          # Django 4.1
-          - django: "4.1"
-            python: "3.10"
+            python: "3.8"
           # Django 4.2
           - django: "4.2"
+            python: "3.8"
+          # Django 5.1
+          - django: "5.1"
             python: "3.10"
+          # Django 5.2
+          - django: "5.2"
+            python: "3.12"
 
     steps:
       - name: Install gettext

CHANGES.rst

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-Changes in 3.2 (2025-02-20)
+Changes in 3.1.2 (2025-02-20)
 ---------------------------
 * Added support to Python 3.10
 * Added support to Django 5.0, 5.1

README.rst

@@ -349,7 +349,7 @@ We use tox to run the test suite on different versions locally (and travis-ci to
 
 To tun the test suite locally, please make sure your python environment has tox and django installed::
 
-    python3.6 -m pip install tox django
+    python3 -m pip install tox django
 
 And then simply execute tox to run the whole test matrix::
 

private_storage/__init__.py

@@ -1,2 +1,2 @@
 # following PEP 440
-__version__ = "3.1.1"
+__version__ = "3.1.2"

setup.py

@@ -36,11 +36,11 @@ def find_version(*parts):
 setup(
     name='django-private-storage',
     version=find_version('private_storage', '__init__.py'),
-    license='Apache 2.0',
+    license='License-Expression :: OSI Approved :: Apache-2.0',
 
     install_requires=[],
     requires=[
-        'Django (>=1.11)',
+        'Django (>=2.2)',
     ],
 
     description='Private media file storage for Django projects',
@@ -52,7 +52,7 @@ def find_version(*parts):
     url='https://github.com/edoburu/django-private-storage',
     download_url='https://github.com/edoburu/django-private-storage/zipball/master',
 
-    packages=find_packages(exclude=('example*',)),
+    packages=find_packages(exclude=('example*',), include=['private_storage/locale/',]),
     include_package_data=True,
 
     #test_suite = 'runtests',
@@ -62,7 +62,6 @@ def find_version(*parts):
         'Environment :: Web Environment',
         'Framework :: Django',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
@@ -71,6 +70,7 @@ def find_version(*parts):
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.12',
         'Framework :: Django',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
@@ -81,6 +81,7 @@ def find_version(*parts):
         'Framework :: Django :: 4.2',
         'Framework :: Django :: 5.0',
         'Framework :: Django :: 5.1',
+        'Framework :: Django :: 5.2',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Application Frameworks',

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist=
-    py310-django{22,31,32,41,42,51},
+    py310-django{22,32,42,51,52},
     py310-django-dev,
     coverage,
 
@@ -13,20 +13,18 @@ deps =
 deps =
     {[base]deps}
     django22: Django~=2.2
-    django30: Django~=3.0
-    django31: Django~=3.1
     django32: Django~=3.2
-    django41: Django~=4.1
     django42: Django~=4.2
     django51: Django~=5.1
-    django-dev: https://github.com/django/django/tarball/stable/4.2.x
+    django52: Django~=5.2
+    django-dev: https://github.com/django/django/tarball/stable/5.2.x
 commands=
     python runtests.py
 
 [testenv:coverage]
 basepython=python3.10
 deps=
-    django~=3.2
+    django~=5.2
     coverage
     {[base]deps}
 commands=