Skip to content

Commit

Permalink
chore: some cleanup (includes removal of versioneer) (#52)
Browse files Browse the repository at this point in the history
  • Loading branch information
holtgrewe authored Oct 30, 2023
1 parent 057abd5 commit 9375620
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 2,455 deletions.
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "weekly"

- package-ecosystem: "npm"
directory: "/varfish/vueapp"
schedule:
interval: "weekly"
30 changes: 0 additions & 30 deletions .prospector.yaml

This file was deleted.

1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ recursive-exclude * *.py[co]

recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif

include versioneer.py
recursive-include varfish_cli *.py

include requirements.txt requirements/*.txt
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _manual-main:

Welcome to VarFish CLI documentation!
====================================
=====================================

* TODO

Expand Down
13 changes: 0 additions & 13 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ exclude =
.tox
docs/
varfish_cli/__init__.py
versioneer.py
venv/

ignore = E203, E266, E501, W503
Expand All @@ -26,17 +25,5 @@ testpaths = tests
omit =
varfish_cli/_version.py

# See the docstring in versioneer.py for instructions. Note that you must
# re-run 'versioneer.py setup' after changing this section, and commit the
# resulting files.

[versioneer]
VCS = git
style = pep440
versionfile_source = varfish_cli/_version.py
versionfile_build = varfish_cli/_version.py
tag_prefix = v
parentdir_prefix = varfish_cli

[mypy]
ignore_missing_imports = true
11 changes: 7 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

from setuptools import find_packages, setup

import versioneer


def parse_requirements(path):
"""Parse ``requirements.txt`` at ``path``."""
Expand All @@ -32,6 +30,12 @@ def parse_requirements(path):
test_requirements = parse_requirements("requirements/test.txt")
install_requirements = parse_requirements("requirements/base.txt")

package_root = os.path.abspath(os.path.dirname(__file__))
version = {}
with open(os.path.join(package_root, "varfish_cli/_version.py")) as fp:
exec(fp.read(), version)
version = version["__version__"]

setup(
author="Manuel Holtgrewe",
author_email=("[email protected]"),
Expand Down Expand Up @@ -59,7 +63,6 @@ def parse_requirements(path):
test_suite="tests",
tests_require=test_requirements,
url="https://github.com/bihealth/varfish-cli",
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
version=version,
zip_safe=False,
)
5 changes: 1 addition & 4 deletions varfish_cli/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
from ._version import get_versions # type: ignore

__version__ = get_versions()["version"]
del get_versions
from ._version import __version__
Loading

0 comments on commit 9375620

Please sign in to comment.