From 0f8fe0e290b065fca531fd61e9b48ec565a33915 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 19 Jan 2023 20:47:26 +0000 Subject: [PATCH] isrt reordering of import statements --- _deploy/debian/localsettingsserver-old.py | 3 ++- _deploy/debian/localsettingsserver.py | 3 ++- _deploy/docker/localsettingsdocker.py | 1 + _deploy/ubuntu/localsettingsubuntu.py | 1 + _deploy/wsl/localsettingsWSL.py | 3 ++- _deploy/xubuntu/localsettingsXubuntu.py | 3 ++- export/toqms.py | 9 +++++---- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/_deploy/debian/localsettingsserver-old.py b/_deploy/debian/localsettingsserver-old.py index 7379a3c..72ab0f0 100644 --- a/_deploy/debian/localsettingsserver-old.py +++ b/_deploy/debian/localsettingsserver-old.py @@ -1,6 +1,7 @@ -import sys import os +import sys import urllib.parse + """Settings for a troggle installation which may vary among different installations: for development or deployment, in a docker image or python virtual environment (venv), on ubuntu, debian or in Windows diff --git a/_deploy/debian/localsettingsserver.py b/_deploy/debian/localsettingsserver.py index bf2fefb..d99e61d 100644 --- a/_deploy/debian/localsettingsserver.py +++ b/_deploy/debian/localsettingsserver.py @@ -1,7 +1,8 @@ -import sys import os +import sys import urllib.parse from pathlib import Path + """Settings for a troggle installation which may vary among different installations: for development or deployment, in a docker image or python virtual environment (venv), on ubuntu, debian or in Windows diff --git a/_deploy/docker/localsettingsdocker.py b/_deploy/docker/localsettingsdocker.py index 76cca3d..2c50761 100644 --- a/_deploy/docker/localsettingsdocker.py +++ b/_deploy/docker/localsettingsdocker.py @@ -1,4 +1,5 @@ import sys + # This is the local settings for use with the docker compose dev setup. It is imported automatically DATABASES = { diff --git a/_deploy/ubuntu/localsettingsubuntu.py b/_deploy/ubuntu/localsettingsubuntu.py index c348cd8..63d3ecc 100644 --- a/_deploy/ubuntu/localsettingsubuntu.py +++ b/_deploy/ubuntu/localsettingsubuntu.py @@ -1,4 +1,5 @@ import sys + # link localsettings to this file for use on expo computer in austria # This will ALL NEED TO BE CHANGED to match localsettingsWSL / python3 / Django v2.2 diff --git a/_deploy/wsl/localsettingsWSL.py b/_deploy/wsl/localsettingsWSL.py index c67f54e..79d9026 100644 --- a/_deploy/wsl/localsettingsWSL.py +++ b/_deploy/wsl/localsettingsWSL.py @@ -1,7 +1,8 @@ -import sys import os +import sys import urllib.parse from pathlib import Path + """Settings for a troggle installation which may vary among different installations: for development or deployment, in a docker image or python virtual environment (venv), on ubuntu, debian or in Windows diff --git a/_deploy/xubuntu/localsettingsXubuntu.py b/_deploy/xubuntu/localsettingsXubuntu.py index 3915ff2..f7072db 100644 --- a/_deploy/xubuntu/localsettingsXubuntu.py +++ b/_deploy/xubuntu/localsettingsXubuntu.py @@ -1,7 +1,8 @@ -import sys import os +import sys import urllib.parse from pathlib import Path + """Settings for a troggle installation which may vary among different installations: for development or deployment, in a docker image or python virtual environment (venv), on ubuntu, debian or in Windows diff --git a/export/toqms.py b/export/toqms.py index 0267261..f939c5b 100644 --- a/export/toqms.py +++ b/export/toqms.py @@ -1,9 +1,10 @@ -import troggle.core.models as models +import csv +import os +import re + from django.conf import settings -import csv -import re -import os +import troggle.core.models as models '''Unused and untested in 2022. Not part fo the re-engineering to make troggle work with QMs. '''