Skip to content

Commit

Permalink
Resolve #250 and a slight bonus trim to source tarball size
Browse files Browse the repository at this point in the history
- This resolves #250, removing the despicable `versioneer` from the code
- As a free bonus: it also removes built docs from the source distribution
  • Loading branch information
pdsen-ci committed Oct 15, 2021
1 parent cd785a1 commit 1b7e4c0
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 2,416 deletions.
1 change: 0 additions & 1 deletion .gitattributes

This file was deleted.

1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

graft src/pds_doi_service
graft docs
prune docs/build
graft features
graft inputs
graft tests
Expand Down
21 changes: 6 additions & 15 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[metadata]
name = pds-doi-service
version = file: src/pds_doi_service/VERSION.txt
author = PDS
author_email = [email protected]
description = Digital Object Identifier service for the Planetary Data System
Expand Down Expand Up @@ -65,7 +66,9 @@ test_suite = pds_doi_service.test.suite

[options.extras_require]
dev =
build
black
wheel
flake8
flake8-bugbear
flake8-docstrings
Expand All @@ -88,7 +91,6 @@ dev =
allure-behave==2.8.13
behave-testrail-reporter==0.4.0
pygit2==1.6.1
versioneer
lxml-stubs
pandas-stubs
types-flask
Expand Down Expand Up @@ -132,7 +134,7 @@ pds.doi_service =


[coverage:run]
omit = */_version.py,*/__init__.py
# No patterns to omit at this time


[test]
Expand All @@ -144,7 +146,7 @@ addopts = -n auto --cov=pds

[flake8]
max-line-length = 120
extend-exclude = versioneer.py,_version.py,docs,tests,setup.py
extend-exclude = docs,tests,setup.py
docstring_convention = google

# Ignoring:
Expand Down Expand Up @@ -183,15 +185,4 @@ extend-ignore = E203, E501, W503
select = D,E,F,N,W,B,B902,B903,B950

[mypy]

[mypy-pds_doi_service._version]
# We don't care about issues in versioneer's files
ignore_errors = True

[versioneer]
VCS = git
style = pep440
tag_prefix = v
versionfile_source = src/pds_doi_service/_version.py
versionfile_build = pds_doi_service/_version.py
parentdir_prefix = pds.pds_doi_service-
# No patterns to ignore at this time
7 changes: 2 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# encoding: utf-8

import setuptools
import versioneer

setuptools.setup(
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
)

setuptools.setup()
1 change: 1 addition & 0 deletions src/pds_doi_service/VERSION.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.0.2
6 changes: 2 additions & 4 deletions src/pds_doi_service/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# encoding: utf-8
"""Planetary Data System's Digital Object Identifier service"""
from ._version import get_versions
import pkg_resources

__version__ = get_versions()["version"]
__date__ = get_versions()["date"]
del get_versions
__version__ = VERSION = pkg_resources.resource_string(__name__, "VERSION.txt").decode("utf-8").strip()
Loading

0 comments on commit 1b7e4c0

Please sign in to comment.