project maintenance updates

This commit is contained in:
Manuel Barkhau 2020-10-04 17:21:45 +00:00
parent b27207d1ff
commit 8ab1644962
8 changed files with 27 additions and 27 deletions

View file

@ -21,9 +21,9 @@ jobs:
path: |
~/miniconda3
build/*.txt
key: ${{ runner.OS }}-conda-cache-${{ hashFiles('requirements/*.txt', 'setup.py', 'makefile*') }}
key: ${{ runner.OS }}-conda-cache-${{ hashFiles('requirements/*.txt', 'setup.py', 'Makefile*') }}
restore-keys: |
${{ runner.OS }}-conda-cache-${{ hashFiles('requirements/*.txt', 'setup.py', 'makefile*') }}
${{ runner.OS }}-conda-cache-${{ hashFiles('requirements/*.txt', 'setup.py', 'Makefile*') }}
- name: make conda
run:

View file

@ -21,8 +21,8 @@ lint:
unit:
# NOTE: Resource_group is conservative and can be disabled
# for simple tests. It should be enabled if the tests
# need exclusive access to some resource common external
# resource. This will prevent multiple pipelines from
# need exclusive access to some common resource. The
# resource_group will prevent multiple pipelines from
# running concurrently.
# resource_group: test-unit
stage: test

View file

@ -213,9 +213,9 @@ projects by reducing the burden of project setup to a minimum.
CHANGELOG.md # short documentation of release history
LICENSE # for public libraries (MIT preferred)
makefile # project specific configuration
Makefile # project specific configuration
# variables and make targets
makefile.bootstrapit.make # bootstrapit make include library
Makefile.bootstrapit.make # bootstrapit make include library
docker_base.Dockerfile # base image for CI (only conda envs)
Dockerfile # image with source of the project

View file

@ -10,8 +10,8 @@ ADD pylint-ignore.md pylint-ignore.md
ADD README.md README.md
ADD CHANGELOG.md CHANGELOG.md
ADD LICENSE LICENSE
ADD makefile makefile
ADD makefile.bootstrapit.make makefile.bootstrapit.make
ADD Makefile Makefile
ADD Makefile.bootstrapit.make Makefile.bootstrapit.make
ADD scripts/exit_0_if_empty.py scripts/exit_0_if_empty.py
ENV PYTHONPATH="src/:vendor/"

View file

@ -57,8 +57,7 @@ CONDA_ENV_BIN_PYTHON_PATHS := \
empty :=
literal_space := $(empty) $(empty)
BDIST_WHEEL_PYTHON_TAG := \
$(subst python,py,$(subst $(literal_space),.,$(subst .,,$(subst =,,$(SUPPORTED_PYTHON_VERSIONS)))))
BDIST_WHEEL_PYTHON_TAG := py2.py3
SDIST_FILE_CMD = ls -1t dist/*.tar.gz | head -n 1
@ -182,7 +181,7 @@ help:
helpMessage = ""; \
} \
}' \
makefile.bootstrapit.make makefile
Makefile.bootstrapit.make Makefile
@if [[ ! -f $(DEV_ENV_PY) ]]; then \
echo "Missing python interpreter at $(DEV_ENV_PY) !"; \
@ -236,7 +235,7 @@ helpverbose:
helpMessage = ""; \
} \
}' \
makefile.bootstrapit.make makefile
Makefile.bootstrapit.make Makefile
## -- Project Setup --
@ -568,7 +567,7 @@ bump_version:
.PHONY: dist_build
dist_build:
$(DEV_ENV_PY) setup.py sdist;
$(DEV_ENV_PY) setup.py bdist_wheel --python-tag=py2.py3;
$(DEV_ENV_PY) setup.py bdist_wheel --python-tag=$(BDIST_WHEEL_PYTHON_TAG);
@rm -rf src/*.egg-info

View file

@ -11,12 +11,15 @@ LICENSE_ID="MIT"
PACKAGE_NAME="pycalver"
GIT_REPO_NAMESPACE="mbarkhau"
GIT_REPO_DOMAIN="gitlab.com"
GIT_REPO_DOMAIN="github.com"
PACKAGE_VERSION="v202010.1040-beta"
DEFAULT_PYTHON_VERSION="python=3.6"
SUPPORTED_PYTHON_VERSIONS="python=2.7 python=3.5 python=3.6 python=3.7 pypy2.7 pypy3.5"
DEFAULT_PYTHON_VERSION="python=3.8"
SUPPORTED_PYTHON_VERSIONS="python=2.7 python=3.6 python=3.8 pypy2.7 pypy3.5"
DOCKER_REGISTRY_DOMAIN=registry.gitlab.com
IS_PUBLIC=1

View file

@ -1,7 +1,7 @@
# Stages:
# root : Common image, both for the builder and for the final image.
# This contains only minimal dependencies required in both cases
# for miniconda and the makefile.
# for miniconda and the Makefile.
# env_builder: stage in which the conda envrionment is created
# and dependencies are installed
# base : the final image containing only the required environment files,
@ -37,8 +37,8 @@ RUN if ! test -z "${ENV_SSH_PRIVATE_RSA_KEY}"; then \
ADD requirements/ requirements/
ADD scripts/ scripts/
ADD makefile.bootstrapit.make makefile.bootstrapit.make
ADD makefile makefile
ADD Makefile.bootstrapit.make Makefile.bootstrapit.make
ADD Makefile Makefile
# install envs (relatively stable)
ADD requirements/conda.txt requirements/conda.txt

View file

@ -19,7 +19,7 @@ warn_redundant_casts = True
[tool:isort]
known_first_party = pycalver,pycalver2
known_first_party = pycalver
known_third_party = click,pathlib2,lexid
force_single_line = True
length_sort = True
@ -83,9 +83,6 @@ exclude =
dist/
.mypy_cache
# Hopefully this can be resolved, so D404, D405 start working
# https://github.com/PyCQA/pydocstyle/pull/188
[tool:pytest]
addopts = --doctest-modules
@ -93,7 +90,7 @@ addopts = --doctest-modules
[pycalver]
current_version = "v202010.1040-beta"
version_pattern = "vYYYY0M.BUILD[-RELEASE[NUM]]"
version_pattern = "vYYYY0M.BUILD[-RELEASE]"
commit_message = "bump {old_version} -> {new_version}"
commit = True
tag = True
@ -109,7 +106,7 @@ setup.py =
src/pycalver/__init__.py =
__version__ = "{version}"
src/pycalver/__main__.py =
click.version_option(version="{version}")
@click.version_option(version="{version}")
src/pycalver*/*.py =
Copyright (c) 2018-YYYY
LICENSE =
@ -126,8 +123,7 @@ README.md =
score = no
reports = no
# pylint spams the same message multiple times if jobs > 1
jobs = 1
jobs = 4
# Set the output format. Available formats are text, parseable, colorized,
# msvs (visual studio) and html. You can also give a reporter class, eg
@ -154,6 +150,8 @@ ignore-comments=yes
ignore-docstrings=yes
ignore-imports=yes
ignored-argument-names=args|kwargs
# https://pylint.pycqa.org/en/stable/technical_reference/features.html
disable =
bad-continuation,