just-work · tumb1er · Jul 17, 2024 · Jul 17, 2024 · Jul 17, 2024 · Jul 17, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
 
     steps:
       - uses: actions/checkout@v2
@@ -19,9 +19,9 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox tox-gh-actions wheel
+          pip install tox tox-gh-actions build wheel
           sed -i '/Django==.*/d' ./requirements.txt # delete django dependency
       - name: Test with tox
         run: |
           tox
-          python setup.py sdist bdist_wheel install
+          python -m build
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -14,8 +14,8 @@ jobs:
         pip install -r requirements.txt
         pip install coverage
         pip install -q -e .
-        python manage.py makemigrations --check --dry-run
-        coverage run manage.py test
+        python tests/manage.py makemigrations --check --dry-run
+        coverage run --source=admin_smoke tests/manage.py test testproject
         coverage xml
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v2

diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml
@@ -20,11 +20,11 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools wheel twine
+          pip install build wheel twine
       - name: Build and publish
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
         run: |
-          python setup.py sdist bdist_wheel
+          python -m build
           twine upload dist/*
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,49 @@
+[build-system]
+requires = ["setuptools>=61.0", "setuptools-git-versioning"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools-git-versioning]
+enabled = true
+
+
+[project]
+name = "django-image-assets"
+dynamic = ["version"]
+description = "Django application for image assets management"
+readme = "README.md"
+authors = [
+    { name = "Sergey Tikhonov", email = "zimbler@gmail.com" },
+]
+
+dependencies = [
+    # Django Framework and batteries
+    "Django>=2.2,<4.2",
+    "django-bitfield~=2.0",
+    # Images
+    "Pillow>=8.1.2,<10.0.0",
+]
+license = { text = "MIT" }
+keywords = [
+    "django",
+    "image",
+    "assets",
+]
+classifiers = [
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.0',
+        'Framework :: Django :: 4.1',
+        'Operating System :: POSIX',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Content Management System',
+]
+
+[project.urls]
+homepage = "https://github.com/just-work/django-image-assets"
+documentation = "https://github.com/just-work/django-image-assets/blob/master/README.md"
+repository = "https://github.com/just-work/django-image-assets.git"
+issues = "https://github.com/just-work/django-image-assets/issues"
diff --git a/setup.py b/setup.py
diff --git a/image_assets/migrations/__init__.py → src/__init__.py b/image_assets/migrations/__init__.py → src/__init__.py
diff --git a/image_assets/__init__.py → src/image_assets/__init__.py b/image_assets/__init__.py → src/image_assets/__init__.py
diff --git a/image_assets/admin.py → src/image_assets/admin.py b/image_assets/admin.py → src/image_assets/admin.py
diff --git a/image_assets/apps.py → src/image_assets/apps.py b/image_assets/apps.py → src/image_assets/apps.py
diff --git a/image_assets/defaults.py → src/image_assets/defaults.py b/image_assets/defaults.py → src/image_assets/defaults.py
diff --git a/image_assets/forms.py → src/image_assets/forms.py b/image_assets/forms.py → src/image_assets/forms.py
diff --git a/image_assets/locale/ru/LC_MESSAGES/django.po → ...ge_assets/locale/ru/LC_MESSAGES/django.po b/image_assets/locale/ru/LC_MESSAGES/django.po → ...ge_assets/locale/ru/LC_MESSAGES/django.po
diff --git a/image_assets/migrations/0001_initial.py → src/image_assets/migrations/0001_initial.py b/image_assets/migrations/0001_initial.py → src/image_assets/migrations/0001_initial.py
@@ -2,7 +2,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import image_assets.models
+import image_assets
 from image_assets import defaults
 
 

diff --git a/...ts/migrations/0002_models_localization.py → ...ts/migrations/0002_models_localization.py b/...ts/migrations/0002_models_localization.py → ...ts/migrations/0002_models_localization.py
@@ -2,7 +2,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import image_assets.models
+import image_assets
 from image_assets import defaults
 
 

diff --git a/...ets/migrations/0003_auto_20200402_0915.py → ...ets/migrations/0003_auto_20200402_0915.py b/...ets/migrations/0003_auto_20200402_0915.py → ...ets/migrations/0003_auto_20200402_0915.py
diff --git a/...ets/migrations/0004_auto_20200402_0942.py → ...ets/migrations/0004_auto_20200402_0942.py b/...ets/migrations/0004_auto_20200402_0942.py → ...ets/migrations/0004_auto_20200402_0942.py
diff --git a/...sets/migrations/0005_assettype_formats.py → ...sets/migrations/0005_assettype_formats.py b/...sets/migrations/0005_assettype_formats.py → ...sets/migrations/0005_assettype_formats.py
diff --git a/...assets/migrations/0006_migrate_formats.py → ...assets/migrations/0006_migrate_formats.py b/...assets/migrations/0006_migrate_formats.py → ...assets/migrations/0006_migrate_formats.py
diff --git a/...ets/migrations/0007_auto_20200406_1313.py → ...ets/migrations/0007_auto_20200406_1313.py b/...ets/migrations/0007_auto_20200406_1313.py → ...ets/migrations/0007_auto_20200406_1313.py
@@ -2,7 +2,7 @@
 
 import bitfield.models
 from django.db import migrations, models
-import image_assets.validators
+import image_assets
 from image_assets import defaults
 
 

diff --git a/...ets/migrations/0008_auto_20200528_0725.py → ...ets/migrations/0008_auto_20200528_0725.py b/...ets/migrations/0008_auto_20200528_0725.py → ...ets/migrations/0008_auto_20200528_0725.py
diff --git a/image_assets/tests/__init__.py → src/image_assets/migrations/__init__.py b/image_assets/tests/__init__.py → src/image_assets/migrations/__init__.py
diff --git a/image_assets/models.py → src/image_assets/models.py b/image_assets/models.py → src/image_assets/models.py
diff --git a/image_assets/signals.py → src/image_assets/signals.py b/image_assets/signals.py → src/image_assets/signals.py
diff --git a/testproject/__init__.py → src/image_assets/tests/__init__.py b/testproject/__init__.py → src/image_assets/tests/__init__.py
diff --git a/image_assets/tests/factories.py → src/image_assets/tests/factories.py b/image_assets/tests/factories.py → src/image_assets/tests/factories.py
diff --git a/image_assets/tests/mixins.py → src/image_assets/tests/mixins.py b/image_assets/tests/mixins.py → src/image_assets/tests/mixins.py
diff --git a/image_assets/validators.py → src/image_assets/validators.py b/image_assets/validators.py → src/image_assets/validators.py
diff --git a/testproject/testapp/__init__.py → tests/__init__.py b/testproject/testapp/__init__.py → tests/__init__.py
diff --git a/manage.py → tests/manage.py b/manage.py → tests/manage.py
diff --git a/testproject/testapp/migrations/__init__.py → tests/testproject/__init__.py b/testproject/testapp/migrations/__init__.py → tests/testproject/__init__.py
diff --git a/testproject/asgi.py → tests/testproject/asgi.py b/testproject/asgi.py → tests/testproject/asgi.py
diff --git a/testproject/settings.py → tests/testproject/settings.py b/testproject/settings.py → tests/testproject/settings.py
@@ -78,10 +78,12 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'NAME': os.path.join(BASE_DIR, '../../db.sqlite3'),
     }
 }
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 
 # Password validation
 # https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators

diff --git a/tests/testproject/testapp/__init__.py b/tests/testproject/testapp/__init__.py
diff --git a/testproject/testapp/admin.py → tests/testproject/testapp/admin.py b/testproject/testapp/admin.py → tests/testproject/testapp/admin.py
diff --git a/testproject/testapp/apps.py → tests/testproject/testapp/apps.py b/testproject/testapp/apps.py → tests/testproject/testapp/apps.py
diff --git a/...roject/testapp/migrations/0001_initial.py → ...roject/testapp/migrations/0001_initial.py b/...roject/testapp/migrations/0001_initial.py → ...roject/testapp/migrations/0001_initial.py
diff --git a/tests/testproject/testapp/migrations/__init__.py b/tests/testproject/testapp/migrations/__init__.py
diff --git a/testproject/testapp/models.py → tests/testproject/testapp/models.py b/testproject/testapp/models.py → tests/testproject/testapp/models.py
diff --git a/testproject/testapp/tests.py → tests/testproject/testapp/tests.py b/testproject/testapp/tests.py → tests/testproject/testapp/tests.py
diff --git a/testproject/testapp/views.py → tests/testproject/testapp/views.py b/testproject/testapp/views.py → tests/testproject/testapp/views.py
diff --git a/testproject/urls.py → tests/testproject/urls.py b/testproject/urls.py → tests/testproject/urls.py
diff --git a/testproject/wsgi.py → tests/testproject/wsgi.py b/testproject/wsgi.py → tests/testproject/wsgi.py
diff --git a/tox.ini b/tox.ini
@@ -28,4 +28,6 @@ deps =
     django3.2: Django~=3.2.0
     django4.0: Django~=4.0.0
     django4.1: Django~=4.1.0
+
+change_dir = tests
 commands = python manage.py test