Skip to content

Commit

Permalink
chore: migrate to src layout, config in setup.cfg, drop `versione…
Browse files Browse the repository at this point in the history
…er` (#206)

* migrate to `src` layout and configuration in `setup.cfg` , drop `versioneer`

* drop devcontainer

* drop 3.7 support

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
kjappelbaum and pre-commit-ci[bot] authored May 12, 2022
1 parent 006be94 commit aa44f78
Show file tree
Hide file tree
Showing 48 changed files with 378 additions and 2,917 deletions.
28 changes: 28 additions & 0 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[bumpversion]
current_version = 0.8.0-dev0
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<release>[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+(?P<build>[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?
serialize =
{major}.{minor}.{patch}-{release}+{build}
{major}.{minor}.{patch}+{build}
{major}.{minor}.{patch}-{release}
{major}.{minor}.{patch}

[bumpversion:part:release]
optional_value = production
first_value = dev
values =
dev
production

[bumpverion:part:build]
values = [0-9A-Za-z-]+

[bumpversion:file:setup.cfg]
search = version = {current_version}
replace = version = {new_version}

[bumpversion:file:src/pyepal/version.py]
search = VERSION = "{current_version}"
replace = VERSION = "{new_version}"
4 changes: 0 additions & 4 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ omit =
*__init__*
*/usr/local/lib*
*test*
*_version
*versioneer
*setup*
*examples/*
*_hypervolume.py*
Expand All @@ -16,8 +14,6 @@ omit =
*__init__*
*/usr/local/lib*
*test*
*_version*
*versioneer*
*setup*
*examples/*
*_hypervolume.py*
24 changes: 24 additions & 0 deletions .deepsource.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
version = 1

test_patterns = ["tests/**"]

exclude_patterns = [
"docs/",
"dev/",
"binder/"
]

[[analyzers]]
name = "python"
enabled = true

[analyzers.meta]
runtime_version = "3.x.x"

[[transformers]]
name = "black"
enabled = true

[[transformers]]
name = "isort"
enabled = true
23 changes: 0 additions & 23 deletions .devcontainer/Dockerfile

This file was deleted.

44 changes: 0 additions & 44 deletions .devcontainer/devcontainer.json

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/python_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest]
python-version: [3.7, 3.8]
python-version: [3.8]
runs-on: ${{ matrix.os }}

steps:
Expand Down
6 changes: 0 additions & 6 deletions .lgtm.yml

This file was deleted.

45 changes: 19 additions & 26 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,38 +34,31 @@ repos:
language: python
types: [text]

# - repo: https://github.com/pre-commit/mirrors-mypy
# rev: "" # Use the sha / tag you want to point at
# hooks:
# - id: mypy
# exclude: (versioneer.py|_version.py|^docs/)


- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
language_version: python3
name: black
exclude: versioneer.py|pyepal/_version.py|^docs/
entry: black
types: [python]
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
language_version: python3
name: black
exclude: ^docs/
entry: black
types: [python]

- repo: https://github.com/PyCQA/isort
rev: '5.10.1' # Use the revision sha / tag you want to point at
hooks:
- id: isort
name: isort
language: python
exclude: versioneer.py|pyepal/_version.py|^docs/
types: [python]
entry: isort
- repo: https://github.com/PyCQA/isort
rev: "5.10.1" # Use the revision sha / tag you want to point at
hooks:
- id: isort
name: isort
language: python
exclude: ^docs/
types: [python]
entry: isort

- repo: local
hooks:
- id: pylint
language: python
types: [file, python]
exclude: versioneer.py|pyepal/_version.py|^docs|pyepal/pal/_hypervolume.py|pyepal/models/coregionalized.py/tests
exclude: ^docs|pyepal/pal/_hypervolume.py|pyepal/models/coregionalized.py/tests
name: pylint
entry: pylint
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[MASTER]
ignore=docs
ignore_patterns=versioneer.py,*version.py,*hypervolume.py,models.coregionalized.py
ignore_patterns=*hypervolume.py,models.coregionalized.py


[MESSAGES CONTROL]
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import os
import sys

from pyepal import __version__
from pyepal.version import VERSION

sys.path.insert(0, os.path.abspath(".."))

Expand All @@ -26,7 +26,7 @@
author = "Kevin Maik Jablonka, Brian Yoo, Berend Smit"

# The full version, including alpha/beta/rc tags
release = __version__
release = VERSION


# -- General configuration ---------------------------------------------------
Expand Down
5 changes: 0 additions & 5 deletions mypy.ini

This file was deleted.

Loading

0 comments on commit aa44f78

Please sign in to comment.