From 70d7f55996dd6f06a375cee59c4742e30ba88fd3 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Mon, 1 Aug 2022 21:09:17 +0300 Subject: [PATCH] Remove nose test runner --- poetry.lock | 44 +------------------------------------------- pyproject.toml | 2 -- sikweb/base.py | 10 ---------- 3 files changed, 1 insertion(+), 55 deletions(-) diff --git a/poetry.lock b/poetry.lock index bd5a342..f26fdd5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -229,17 +229,6 @@ category = "main" optional = false python-versions = "*" -[[package]] -name = "django-nose" -version = "1.4.7" -description = "Makes your Django tests simple and snappy" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -nose = ">=1.2.1" - [[package]] name = "django-phonenumber-field" version = "4.0.0" @@ -439,25 +428,6 @@ category = "dev" optional = false python-versions = "*" -[[package]] -name = "nose" -version = "1.3.7" -description = "nose extends unittest to make testing easier" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "nose-exclude" -version = "0.5.0" -description = "Exclude specific directories from nosetests runs." -category = "dev" -optional = false -python-versions = "*" - -[package.dependencies] -nose = "*" - [[package]] name = "openpyxl" version = "2.6.4" @@ -873,7 +843,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest- [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "2ae9e0ce8828c74092fb41b48dd17521fecec78408b93bec5ba7f66acbc2fa41" +content-hash = "dd88b3c465cf276a9028495a385d800bb86cbd71b2703fcdbec20015a20aa9eb" [metadata.files] attrs = [ @@ -937,10 +907,6 @@ django-jsonfield = [ django-modeltranslation = [ {file = "django-modeltranslation-0.13.4.tar.gz", hash = "sha256:c03070a29e35b498da3f07e80d6847bf9236e6231102829e62d437b6022cfb5c"}, ] -django-nose = [ - {file = "django-nose-1.4.7.tar.gz", hash = "sha256:a4885cd002d65fd2de96e2bb2563ef477c3fbe207009360c015fca5c3b5561b7"}, - {file = "django_nose-1.4.7-py2.py3-none-any.whl", hash = "sha256:304adc447ee35b889b733d7106004f98aa401d8387ddcada5d4f2239d86790a9"}, -] django-phonenumber-field = [ {file = "django-phonenumber-field-4.0.0.tar.gz", hash = "sha256:d4580cc3352f4433962825f9927e6669852c1b40ec484fcb5a74064dabc1201a"}, {file = "django_phonenumber_field-4.0.0-py3-none-any.whl", hash = "sha256:2ca3bb0ada0ebc164bd903a981a34f1202a4294006e520b0da961bd7ce9f20a4"}, @@ -997,14 +963,6 @@ mypy-extensions = [ {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, ] -nose = [ - {file = "nose-1.3.7-py2-none-any.whl", hash = "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a"}, - {file = "nose-1.3.7-py3-none-any.whl", hash = "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac"}, - {file = "nose-1.3.7.tar.gz", hash = "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"}, -] -nose-exclude = [ - {file = "nose-exclude-0.5.0.tar.gz", hash = "sha256:f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"}, -] openpyxl = [ {file = "openpyxl-2.6.4.tar.gz", hash = "sha256:1d53801678e18d7fe38c116f1ad0c2383a654670c4c8806105b611c92d92f2e3"}, ] diff --git a/pyproject.toml b/pyproject.toml index 7caa5f8..1b9e086 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,6 @@ Django = "^2.2.19" requests = "2.27.1" django-cors-headers = "^3.7.0" djangorestframework = "^3.12.4" -django-nose = "^1.4.5" psycopg2-binary = "2.8.6" django-bootstrap3 = "^11.1.0" django-tables2 = "^1.6.1" @@ -41,7 +40,6 @@ djangorestframework-simplejwt = "^5.2.0" [tool.poetry.dev-dependencies] coverage = "^6.4.2" -nose-exclude = "^0.5.0" safety = "^2.1.1" black = "^22.6.0" diff --git a/sikweb/base.py b/sikweb/base.py index b3f6b64..b7474dd 100644 --- a/sikweb/base.py +++ b/sikweb/base.py @@ -86,7 +86,6 @@ LOGGING = { # Application definition IMPORT_EXPORT_USE_TRANSACTIONS = True -TEST_RUNNER = "django_nose.NoseTestSuiteRunner" # Could be replaced with CORS_ALLOWED_ORIGINS list. # See (check correct package version in the link) https://github.com/adamchainz/django-cors-headers/tree/3.7.0#configuration CORS_ALLOW_ALL_ORIGINS = True @@ -113,7 +112,6 @@ INSTALLED_APPS = [ "ohlhafv", "rest_framework", "rest_framework_simplejwt", - "django_nose", "bootstrap3", "django_tables2", "auditlog", @@ -122,14 +120,6 @@ INSTALLED_APPS = [ "django_filters", ] -NOSE_ARGS = [ - "--with-coverage", - "--cover-package=webapp,members,infoscreen", - "--exclude-dir={}".format(os.path.join(BASE_DIR, "members", "migrations")), - "--exclude-dir={}".format(os.path.join(BASE_DIR, "infoscreen", "migrations")), - "--exclude-dir={}".format(os.path.join(BASE_DIR, "webapp", "migrations")), -] - MIDDLEWARE = [ "sikweb.middleware.ForceDefaultLanguageMiddleware", "django.middleware.security.SecurityMiddleware",