Merge branch 'main' of https://git.cpi.imtek.uni-freiburg.de/holgi/superx-budget-overview into main

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+per-file-ignores = tests/*:S101

.gitignore

@@ -45,7 +45,6 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *,cover
-mail/
 
 # Translations
 *.mo
@@ -63,5 +62,3 @@ target/
 # Mac Stuff
 .DS_Store
 
-# Pyramid
-production.ini

CONTRIBUTING.md

@@ -11,7 +11,7 @@ Types of Contributions
 
 ### Report Bugs
 
-Report bugs at https://github.com/holgi/superx_budget/issues.
+Report bugs at https://git.cpi.imtek.uni-freiburg.de/CPI/superx-budget-overview.git/issues.
 
 If you are reporting a bug, please include:
 
@@ -31,13 +31,13 @@ and "help wanted" is open to whoever wants to implement it.
 
 ### Write Documentation
 
-superx_budget could always use more documentation, whether as part of the
+SuperX Budget could always use more documentation, whether as part of the
-official superx_budget docs, in docstrings, or even on the web in blog posts,
+official SuperX Budget docs, in docstrings, or even on the web in blog posts,
 articles, and such.
 
 ### Submit Feedback
 
-The best way to send feedback is to file an issue at https://github.com/holgi/superx_budget/issues.
+The best way to send feedback is to file an issue at https://git.cpi.imtek.uni-freiburg.de/CPI/superx-budget-overview.git/issues.
 
 If you are proposing a feature:
 

Dockerfile

@@ -0,0 +1,37 @@
+FROM ubuntu:latest
+
+# update to the latest packages
+ENV DEBIAN_FRONTEND="noninteractive"
+RUN apt-get update && apt-get upgrade -y
+
+# add user that will be used to install and run the application
+RUN groupadd -g 1000 deploy
+RUN useradd -m -u 1000 -g deploy deploy
+
+# install required packages for debugging
+# RUN apt-get install -y vim curl lsof
+
+
+#
+# CUSTOM PART IS BELOW HERE
+#
+
+
+# install required packages
+RUN apt-get install -y python3 python3-pip
+
+# switch to the created user and install the application
+USER deploy
+ENV PATH "$PATH:/home/deploy/.local/bin"
+
+COPY . /app
+WORKDIR /app
+
+RUN pip install --upgrade pip
+RUN pip install gunicorn
+RUN pip install wheel
+RUN pip install flit
+
+RUN flit install --pth-file
+
+CMD ["gunicorn", "--paster", "/app/production.ini", "-b", "0.0.0.0:8000"]

Makefile

@@ -51,16 +51,19 @@ clean-test: ## remove test and coverage artifacts
 	rm -fr htmlcov/
 
 lint: ## reformat with black and check style with flake8
-	isort -rc superx_budget
+	isort superx_budget
-	isort -rc tests
+	isort tests
 	black superx_budget tests
 	flake8 superx_budget tests
 
 test: lint ## run tests quickly with the default Python
-	pytest tests -x --disable-warnings -m "not app"
+	pytest tests -x --disable-warnings -m "not fun"
+
+testall: lint ## run tests quickly with the default Python
+	pytest tests
 
 coverage: lint ## full test suite, check code coverage and open coverage report
-	pytest tests --cov=superx_budget
+	pytest tests --cov=superx_budget -m "fun"
 	coverage html
 	$(BROWSER) htmlcov/index.html
 
@@ -73,12 +76,15 @@ install:  ## install updated project.toml with flint
 devenv: ## setup development environment
 	python3 -m venv --prompt superx_budget .venv
 	.venv/bin/pip3 install --upgrade pip
-	.venv/bin/pip3 install flit
+	.venv/bin/pip3 install "flit>3.2"
 	.venv/bin/flit install --pth-file
 
 repo: devenv ## complete project setup with development environment and git repo
 	git init .
+	git branch -m main
 	git add .
 	git commit -m "import of project template"
+	git remote add origin https://git.cpi.imtek.uni-freiburg.de/CPI/superx-budget-overview.git
+	git push -u origin main --no-verify
 	
 	.venv/bin/pre-commit install --install-hooks

pyproject.toml

@@ -4,14 +4,17 @@
 requires = ["flit"]
 build-backend = "flit.buildapi"
 
-[tool.flit.metadata]
+[project]
-module = "superx_budget"
+name = "superx_budget"
-dist-name = "superx_budget"
+readme = "README.md"
-author = "Holger Frey"
+description = "Creating a budget overview from a SuperX export."
-author-email = "frey@imtek.de"
+license = { file = "LICENSE" }
-home-page = "https://github.com/holgi/superx_budget"
+requires-python = ">=3.7"
-description-file = "README.md"
+dynamic = ["version"]
-license = "Beerware"
+
+authors = [
+    {name = "Holger Frey", email = "frey@imtek.de"},
+]
 
 # see https://pypi.org/classifiers/
 classifiers = [
@@ -23,47 +26,51 @@ classifiers = [
     "License :: Freely Distributable",
 ]
 
-requires = [
+dependencies = [
     "openpyxl >= 3.0.0",
-    "pyramid >= 1.10",
+    "pyramid >= 2.0",
-    "pyramid_jinja2 >= 2.7",
+    "pyramid_jinja2",
-    "pyramid_mailer >= 0.15.1",
+    "pyramid_mailer",
-    "waitress >= 1.4.3",
+    "waitress",
+    "passlib[argon2]",
 ]
-requires-python = ">=3.7"
 
-[tool.flit.metadata.requires-extra]
+[project.entry-points."paste.app_factory"]
+main = "superx_budget:main"
+
+[project.urls]
+Source = "https://git.cpi.imtek.uni-freiburg.de/CPI/superx-budget-overview.git"
+
+[project.optional-dependencies]
 test = [
-    "passlib[argon2] >= 1.7.2",
     "pytest >=4.0.0",
     "pytest-cov",
     "pytest-mock",
+    "pytest-randomly",
     "tox",
 ]
 dev = [
     "black",
     "flake8",
     "flake8-comprehensions",
-    "isort",
+    "flake8-bandit",
+    "isort >= 5.0.0",
     "keyring",
     "pre-commit",
 ]
 
-[tool.flit.entrypoints."paste.app_factory"]
-main = "superx_budget:main"
-
 [tool.black]
 line-length = 79
-py37 = true
+target-version = ['py37','py38', 'py39']
 include = '\.pyi?$'
-exclude = '''
+extend-exclude = '''
-/(
+# A regex preceded with ^/ will apply only to files and directories
-    \.git
+# in the root of the project.
-  | \.tox
+^/.git
-  | \.venv
+^/.tox
-  | build
+^/.venv
-  | dist
+^/.build
-)/
+^/.dist
 '''
 
 [tool.isort]
@@ -71,3 +78,11 @@ line_length=79
 multi_line_output=3
 length_sort="True"
 include_trailing_comma="True"
+
+[tool.pytest.ini_options]
+markers = [
+    "fun: marks tests as functional (deselect with '-m \"not fun\"')",
+]
+addopts = [
+    "--strict-markers",
+]

superx_budget/pyramid/__init__.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from pyramid.view import notfound_view_config
 from pyramid.config import Configurator
 from pyramid.session import JSONSerializer, SignedCookieSessionFactory
-from pyramid.security import Allow, Everyone, Authenticated
+from pyramid.authorization import Allow, Everyone, Authenticated
 from pyramid.httpexceptions import HTTPFound
 
 from ..overview import create_overview  # noqa: F401