From f67825e76ceec29c38efa1ce444567e634c6c80b Mon Sep 17 00:00:00 2001 From: Tobias Schmidl Date: Fri, 12 Feb 2021 06:58:50 +0100 Subject: [PATCH] moved scaffolding files to .pscaffold --- .gitignore | 107 +------------------------------------------------ .gitlab-ci.yml | 22 ++++++++++ .gitmodules | 3 ++ .pscaffold | 1 + .style.yapf | 34 +--------------- pylama.ini | 15 +------ 6 files changed, 29 insertions(+), 153 deletions(-) mode change 100644 => 120000 .gitignore create mode 100644 .gitlab-ci.yml create mode 100644 .gitmodules create mode 160000 .pscaffold mode change 100644 => 120000 .style.yapf mode change 100644 => 120000 pylama.ini diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e0e3af3..0000000 --- a/.gitignore +++ /dev/null @@ -1,106 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -.hypothesis/ -.pytest_cache/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# pyenv -.python-version - -# celery beat schedule file -celerybeat-schedule - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -/tags -/tags.* diff --git a/.gitignore b/.gitignore new file mode 120000 index 0000000..c803af3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pscaffold/.gitignore \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..3a1d417 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,22 @@ +image: python:alpine + +test:pylama: + stage: test + only: + - master + - develop + before_script: + - if test -r requirements.txt; then pip install -r requirements.txt; fi + script: + if test -x "$(which pylama)"; then pylama *.py; fi + +test:pytest: + stage: test + only: + - master + - develop + before_script: + - if test -r requirements.txt; then pip install -r requirements.txt; fi + script: + if test -x "$(which pytest)"; then pytest .; fi + diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..09ac888 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule ".pscaffold"] + path = .pscaffold + url = ../pscaffold.git diff --git a/.pscaffold b/.pscaffold new file mode 160000 index 0000000..c853254 --- /dev/null +++ b/.pscaffold @@ -0,0 +1 @@ +Subproject commit c8532548825b9f01601e096e8286ee011dbfac8e diff --git a/.style.yapf b/.style.yapf deleted file mode 100644 index b34c3f4..0000000 --- a/.style.yapf +++ /dev/null @@ -1,33 +0,0 @@ -[style] - -# Insert a blank line before a module docstring. -blank_line_before_module_docstring=True - -# The column limit. -column_limit=120 - -# Split before the '.' if we need to split a longer expression: -# -# foo = ('This is a really long string: {}, {}, {}, {}'.format(a, b, c, d)) -# -# would reformat to something like: -# -# foo = ('This is a really long string: {}, {}, {}, {}' -# .format(a, b, c, d)) -split_before_dot=True - -# Set to True to split list comprehensions and generators that have -# non-trivial expressions and multiple clauses before each of these -# clauses. For example: -# -# result = [ -# a_long_var + 100 for a_long_var in xrange(1000) -# if a_long_var % 10] -# -# would reformat to something like: -# -# result = [ -# a_long_var + 100 -# for a_long_var in xrange(1000) -# if a_long_var % 10] -split_complex_comprehension=True diff --git a/.style.yapf b/.style.yapf new file mode 120000 index 0000000..e4269e9 --- /dev/null +++ b/.style.yapf @@ -0,0 +1 @@ +.pscaffold/.style.yapf \ No newline at end of file diff --git a/pylama.ini b/pylama.ini deleted file mode 100644 index 5f3e097..0000000 --- a/pylama.ini +++ /dev/null @@ -1,14 +0,0 @@ -[pylama] -format = pylint -linters = mccabe,pep257,pydocstyle,pep8,pycodestyle,pyflakes,pylint,isort,mypy -ignore = D203 -skip=.env/* - -[pylama:pycodestyle] -max_line_length = 120 - -[pylama:pep8] -max_line_length = 120 - -[pylama:pylint] -max_line_length = 120 diff --git a/pylama.ini b/pylama.ini new file mode 120000 index 0000000..9ad5e0b --- /dev/null +++ b/pylama.ini @@ -0,0 +1 @@ +.pscaffold/pylama.ini \ No newline at end of file