diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..d1a0d79 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,16 @@ +[run] +source = ./src/newsreader/ +omit = + **/tests/** + **/migrations/** + **/conf/** + **/apps.py + **/admin.py + **/tests.py + **/urls.py + **/wsgi.py + **/celery.py + **/__init__.py + +[html] +directory = coverage diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 5257a12..0000000 --- a/.editorconfig +++ /dev/null @@ -1,25 +0,0 @@ -# https://editorconfig.org - -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -trim_trailing_whitespace = true - -[*.py] -indent_style = space -indent_size = 4 - -[*.{yaml,yml,toml,md}] -indent_style = space -indent_size = 2 - -[Dockerfile*] -indent_style = space -indent_size = 4 - -[*.json] -indent_style = space -indent_size = 2 diff --git a/.isort.cfg b/.isort.cfg new file mode 100644 index 0000000..0c8e37f --- /dev/null +++ b/.isort.cfg @@ -0,0 +1,12 @@ +[settings] +include_trailing_comma = true +line_length = 88 +multi_line_output = 3 +skip = env/, venv/ +default_section = THIRDPARTY +known_first_party = newsreader +known_django = django +sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER +lines_between_types=1 +lines_after_imports=2 +lines_between_types=1 diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 0000000..146a217 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,10 @@ +{ + "semi": true, + "trailingComma": "es5", + "singleQuote": true, + "printWidth": 90, + "tabWidth": 2, + "useTabs": false, + "bracketSpacing": true, + "arrowParens": "avoid" +} diff --git a/jest.config.js b/jest.config.js new file mode 100644 index 0000000..c8473a7 --- /dev/null +++ b/jest.config.js @@ -0,0 +1,6 @@ +module.exports = { + roots: ['src/newsreader/js/tests/'], + + clearMocks: true, + coverageDirectory: 'coverage', +}; diff --git a/package.json b/package.json index 8e1f60f..3b251da 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "newsreader", "version": "0.5.3", "description": "Application for viewing RSS feeds", + "main": "index.js", "scripts": { "lint": "npx prettier \"src/newsreader/js/**/*.js\" --check", "format": "npx prettier \"src/newsreader/js/**/*.js\" --write", @@ -13,7 +14,7 @@ }, "repository": { "type": "git", - "url": "forgejo.fudiggity.nl:sonny/newsreader" + "url": "[git@git.fudiggity.nl:5000]:sonny/newsreader.git" }, "author": "Sonny", "license": "GPL-3.0-or-later", @@ -54,22 +55,5 @@ "webpack": "^5.94.0", "webpack-cli": "^5.1.4", "webpack-merge": "^4.2.2" - }, - "prettier": { - "semi": true, - "trailingComma": "es5", - "singleQuote": true, - "printWidth": 90, - "tabWidth": 2, - "useTabs": false, - "bracketSpacing": true, - "arrowParens": "avoid" - }, - "jest": { - "roots": [ - "src/newsreader/js/tests/" - ], - "clearMocks": true, - "coverageDirectory": "coverage" } } diff --git a/pyproject.toml b/pyproject.toml index 5f0d46a..c722183 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,81 +1,66 @@ [project] -name = "newsreader" -version = "0.5.3" -authors = [{ name = "Sonny" }] -license = { text = "GPL-3.0" } -requires-python = ">=3.11" +name = 'newsreader' +version = '0.5.3' +authors = [{ name = 'Sonny', email= 'sonny871@hotmail.com' }] +license = {text = 'GPL-3.0'} +requires-python = '>=3.11' dependencies = [ - "django~=4.2", - "celery~=5.4", - "psycopg", - "django-axes", - "django-celery-beat~=2.7.0", - "django-rest-framework", - "djangorestframework-camel-case", - "pymemcache", - "python-dotenv~=1.0.1", - "ftfy~=6.2", - "requests", - "feedparser", - "bleach", - "beautifulsoup4", - "lxml", + 'django~=4.2', + 'celery~=5.4', + 'psycopg', + 'django-axes', + 'django-celery-beat~=2.7.0', + 'django-rest-framework', + 'djangorestframework-camel-case', + 'pymemcache', + 'python-dotenv~=1.0.1', + 'ftfy~=6.2', + 'requests', + 'feedparser', + 'bleach', + 'beautifulsoup4', + 'lxml', ] [dependency-groups] -test-tools = ["ruff", "factory_boy", "freezegun"] +test-tools = ['ruff', 'factory_boy', 'freezegun'] development = [ - "django-debug-toolbar", - "django-stubs", - "django-extensions", + 'django-debug-toolbar', + 'django-stubs', + 'django-extensions', ] -ci = ["coverage~=7.6.1"] -production = ["gunicorn~=23.0"] +ci = ['coverage~=7.6.1'] +production = ['gunicorn~=23.0'] [project.optional-dependencies] -sentry = ["sentry-sdk~=2.0"] +sentry = ['sentry-sdk~=2.0'] [tool.uv] -environments = ["sys_platform == "linux""] -default-groups = ["test-tools"] +environments = ["sys_platform == 'linux'"] +default-groups = ['test-tools'] [tool.ruff] -include = ["pyproject.toml", "src/**/*.py"] +include = ['pyproject.toml', 'src/**/*.py'] line-length = 88 [tool.ruff.lint] -select = ["E4", "E7", "E9", "F", "I"] +select = ['E4', 'E7', 'E9', 'F', 'I'] [tool.ruff.lint.isort] lines-between-types=1 lines-after-imports=2 -default-section = "third-party" -known-first-party = ["transip_client"] +default-section = 'third-party' +known-first-party = ['transip_client'] section-order = [ - "future", - "standard-library", - "django", - "third-party", - "first-party", - "local-folder", + 'future', + 'standard-library', + 'django', + 'third-party', + 'first-party', + 'local-folder', ] [tool.ruff.lint.isort.sections] -django = ["django"] - -[tool.coverage.run] -source = ["./src/newsreader/"] -omit = [ - "**/tests/**" - "**/migrations/**", - "**/conf/**", - "**/apps.py", - "**/admin.py", - "**/tests.py", - "**/urls.py", - "**/wsgi.py", - "**/celery.py", - "**/__init__.py -] +django = ['django']