From 64fa00b488e91039902425b0539c4a5af4f2dcad Mon Sep 17 00:00:00 2001 From: Tom Hayward Date: Sun, 26 Feb 2023 11:29:32 -0800 Subject: [PATCH 1/5] convert get_query_set() to get_queryset() --- portal/models.py | 6 +++--- portal/network.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/portal/models.py b/portal/models.py index 4f11ccf..59692cf 100644 --- a/portal/models.py +++ b/portal/models.py @@ -51,14 +51,14 @@ ) class DomainSortManager(models.Manager): - def get_query_set(self): + def get_queryset(self): if DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql_psycopg2': - return super(DomainSortManager, self).get_query_set().extra( + return super(DomainSortManager, self).get_queryset().extra( select={'domain_order': "array_reverse(regexp_split_to_array(name, '\.'))"}, order_by=['owner__username', 'domain_order']) else: - return super(DomainSortManager, self).get_query_set() + return super(DomainSortManager, self).get_queryset() class Site(models.Model): diff --git a/portal/network.py b/portal/network.py index 7a35f6d..b9456f0 100644 --- a/portal/network.py +++ b/portal/network.py @@ -30,14 +30,14 @@ def __init__(self, qs_class=models.query.QuerySet): self.queryset_class = qs_class super(IPNetworkManager, self).__init__() - def get_query_set(self): + def get_queryset(self): return self.queryset_class(self.model) def __getattr__(self, attr, *args): try: return getattr(self.__class__, attr, *args) except AttributeError: - return getattr(self.get_query_set(), attr, *args) + return getattr(self.get_queryset(), attr, *args) class IPNetworkQuerySet(models.query.QuerySet): From bff1199fae26ece3eebd711edd1530e92b2227fe Mon Sep 17 00:00:00 2001 From: Tom Hayward Date: Sun, 26 Feb 2023 11:38:40 -0800 Subject: [PATCH 2/5] fix ModelForm Creating a ModelForm without either the 'fields' attribute or the 'exclude' attribute is deprecated. Added 'exclude'. --- dns/forms.py | 1 + portal/forms.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dns/forms.py b/dns/forms.py index b258a2e..e2b5578 100644 --- a/dns/forms.py +++ b/dns/forms.py @@ -58,3 +58,4 @@ def _rev_to_ip(self, name): class Meta: model = Record + exclude = [] diff --git a/portal/forms.py b/portal/forms.py index ad54c18..547ac88 100644 --- a/portal/forms.py +++ b/portal/forms.py @@ -43,6 +43,7 @@ def clean_name(self): class IPAddressForm(forms.ModelForm): class Meta: model = IPAddress + exclude = [] class UserIPAddressForm(IPAddressForm): @@ -76,6 +77,7 @@ def clean(self): class SubnetForm(forms.ModelForm): class Meta: model = Subnet + exclude = [] class UserSubnetForm(SubnetForm): From 8c7fb100487f11fe5833c647ad7cc92a554555fb Mon Sep 17 00:00:00 2001 From: Tom Hayward Date: Sun, 26 Feb 2023 11:50:19 -0800 Subject: [PATCH 3/5] use new test runner --- hamwanadmin/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hamwanadmin/settings.py b/hamwanadmin/settings.py index efed9c4..522a4bf 100644 --- a/hamwanadmin/settings.py +++ b/hamwanadmin/settings.py @@ -97,6 +97,7 @@ 'portal.context_processors.encrypted44', ) +TEST_RUNNER = 'django.test.runner.DiscoverRunner' MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', From 50baf0d43f0827a32536efe823b42e4826d609e4 Mon Sep 17 00:00:00 2001 From: Tom Hayward Date: Sun, 26 Feb 2023 11:51:45 -0800 Subject: [PATCH 4/5] verbose test in CI --- .github/workflows/django.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index af94e09..7b4f90e 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -21,4 +21,4 @@ jobs: run: docker build --build-arg PYTHON_VERSION=${{ matrix.python-version }} -t hamwan-portal . - name: Run Tests run: | - docker run --rm hamwan-portal manage.py test + docker run --rm hamwan-portal manage.py test -v3 From 6f0273943c269439bdd8256f0485ea1775ed3cbd Mon Sep 17 00:00:00 2001 From: Tom Hayward Date: Sun, 26 Feb 2023 11:59:01 -0800 Subject: [PATCH 5/5] add Makefile to aid in running tests --- .github/workflows/django.yml | 5 ++--- Makefile | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 Makefile diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 7b4f90e..bcc78d2 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -18,7 +18,6 @@ jobs: steps: - uses: actions/checkout@v2 - name: Build Container Image - run: docker build --build-arg PYTHON_VERSION=${{ matrix.python-version }} -t hamwan-portal . + run: make docker PYTHON_VERSION=${{ matrix.python-version }} - name: Run Tests - run: | - docker run --rm hamwan-portal manage.py test -v3 + run: make test diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2f459e9 --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +IMAGE := hamwan-portal +PYTHON_VERSION ?= 2.7 +DOCKER_RUNNER := docker run --rm -v $(shell pwd):/app $(IMAGE) + +docker: + docker build --build-arg PYTHON_VERSION=$(PYTHON_VERSION) -t $(IMAGE) . + +test: + $(DOCKER_RUNNER) manage.py test -v3