From 13c7e2af491150700b6eec9ccf1b11c0c717a25d Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 20 Apr 2020 19:28:09 +1000 Subject: [PATCH 1/4] Update version.py Modify version number for release --- InvenTree/InvenTree/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/InvenTree/version.py b/InvenTree/InvenTree/version.py index 2b0d02bfe9..7aa59dc9d2 100644 --- a/InvenTree/InvenTree/version.py +++ b/InvenTree/InvenTree/version.py @@ -6,7 +6,7 @@ import subprocess from common.models import InvenTreeSetting import django -INVENTREE_SW_VERSION = "0.0.12 pre" +INVENTREE_SW_VERSION = "0.0.12" def inventreeInstanceName(): From c5166ec845ffe9477ab488931775dcdfd1dce7e7 Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 20 Apr 2020 19:30:58 +1000 Subject: [PATCH 2/4] Update version.py --- InvenTree/InvenTree/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/InvenTree/version.py b/InvenTree/InvenTree/version.py index 7aa59dc9d2..213cad3d81 100644 --- a/InvenTree/InvenTree/version.py +++ b/InvenTree/InvenTree/version.py @@ -6,7 +6,7 @@ import subprocess from common.models import InvenTreeSetting import django -INVENTREE_SW_VERSION = "0.0.12" +INVENTREE_SW_VERSION = "0.0.13 pre" def inventreeInstanceName(): From 1f4bd95d758db4e2388b180f637963e26a033790 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 26 Apr 2020 08:50:37 +1000 Subject: [PATCH 3/4] Remove the problematic migration entirely - The thumbnail check code is run every time the server is started anyway! --- .../migrations/0034_auto_20200404_1238.py | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/InvenTree/part/migrations/0034_auto_20200404_1238.py b/InvenTree/part/migrations/0034_auto_20200404_1238.py index b93fb64607..afd463d30d 100644 --- a/InvenTree/part/migrations/0034_auto_20200404_1238.py +++ b/InvenTree/part/migrations/0034_auto_20200404_1238.py @@ -1,32 +1,20 @@ # Generated by Django 2.2.10 on 2020-04-04 12:38 from django.db import migrations -from django.db.utils import OperationalError, ProgrammingError - -from part.models import Part -from stdimage.utils import render_variations def create_thumbnails(apps, schema_editor): """ Create thumbnails for all existing Part images. - """ - try: - for part in Part.objects.all(): - # Render thumbnail for each existing Part - if part.image: - try: - part.image.render_variations() - except FileNotFoundError: - print("Missing image:", part.image()) - # The image is missing, so clear the field - part.image = None - part.save() - - except (OperationalError, ProgrammingError): - # Migrations have not yet been applied - table does not exist - print("Could not generate Part thumbnails") + Note: This functionality is now performed in apps.py, + as running the thumbnail script here caused too many database level errors. + + This migration is left here to maintain the database migration history + + """ + pass + class Migration(migrations.Migration): @@ -35,5 +23,5 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(create_thumbnails), + migrations.RunPython(create_thumbnails, reverse_code=create_thumbnails), ] From ae4717401f2770b3dc659c884f8cedb3e5a436a7 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 26 Apr 2020 08:56:36 +1000 Subject: [PATCH 4/4] Add "sudo" to makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cb38a601d8..630784becf 100644 --- a/Makefile +++ b/Makefile @@ -31,12 +31,12 @@ superuser: # Install pre-requisites for mysql setup mysql: - apt-get install mysql-server libmysqlclient-dev + sudo apt-get install mysql-server libmysqlclient-dev pip3 install mysqlclient # Install pre-requisites for postgresql setup postgresql: - apt-get install postgresql postgresql-contrib libpq-dev + sudo apt-get install postgresql postgresql-contrib libpq-dev pip3 install psycopg2 # Update translation files