Skip to content

Commit

Permalink
Merge pull request #2111 from martinholmer/drop-versioneer
Browse files Browse the repository at this point in the history
Remove versioneer.py and related files and code
  • Loading branch information
martinholmer authored Nov 13, 2018
2 parents aa8dbc5 + aa7d373 commit 67ca17e
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 1,153 deletions.
1 change: 0 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[run]
omit =
taxcalc/_version.py
taxcalc/calcfunctions.py
taxcalc/*.json
taxcalc/cli/*
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ TESTS_JSON_FILES := $(shell ls -l ./taxcalc/tests/*json | awk '{print $$9}')
PYLINT_FILES := $(shell grep -rl --include="*py" disable=locally-disabled .)
PYLINT_OPTIONS = --disable=locally-disabled --score=no --jobs=4
RECIPE_FILES := $(shell ls -l ./docs/cookbook/recipe*py | awk '{print $$9}')
RECIPE_OPTIONS = --disable=C0103,C0111,W0401,W0614 --score=no --jobs=4
RECIPE_OPTIONS = --disable=C0103,C0111,W0401,W0614,E0401 --score=no --jobs=4

.PHONY=cstest
cstest:
Expand Down
12 changes: 1 addition & 11 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
import versioneer
versioneer.VCS = 'git'
versioneer.versionfile_source = 'taxcalc/_version.py'
versioneer.versionfile_build = 'taxcalc/_version.py'
versioneer.tag_prefix = '' # tags are like 1.2.0
versioneer.parentdir_prefix = 'taxcalc-'
# above dirname like 'taxcalc-1.2.0'

try:
from setuptools import setup
except ImportError:
Expand All @@ -14,8 +6,7 @@
with open('README.md') as f:
longdesc = f.read()

version = versioneer.get_version()
cmdclass = versioneer.get_cmdclass()
version = '0.0.0'

config = {
'description': 'Tax Calculator',
Expand All @@ -24,7 +15,6 @@
'description': 'taxcalc',
'long_description': longdesc,
'version': version,
'cmdclass': cmdclass,
'license': 'CC0 1.0 Universal public domain dedication',
'packages': ['taxcalc', 'taxcalc.tbi', 'taxcalc.cli'],
'include_package_data': True,
Expand Down
4 changes: 1 addition & 3 deletions taxcalc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,4 @@
from taxcalc.tbi import *
from taxcalc.cli import *

from taxcalc._version import get_versions
__version__ = get_versions()['version']
del get_versions
__version__ = '0.0.0'
192 changes: 0 additions & 192 deletions taxcalc/_version.py

This file was deleted.

5 changes: 1 addition & 4 deletions taxcalc/cli/tc.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,7 @@ def cli_tc_main():
args = parser.parse_args()
# show Tax-Calculator version and quit if --version option specified
if args.version:
version = tc.__version__
if version == 'unknown':
version = 'locally.generated.package'
sys.stdout.write('Tax-Calculator {}\n'.format(version))
sys.stdout.write('Tax-Calculator {}\n'.format(tc.__version__))
return 0
# write test input and expected output files if --test option specified
if args.test:
Expand Down
Loading

0 comments on commit 67ca17e

Please sign in to comment.