Skip to content

Commit

Permalink
update details around packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
fitnr committed Feb 5, 2019
1 parent 5e3a8d3 commit daadf23
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 20 deletions.
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include *.md
include LICENSE
18 changes: 8 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,19 @@

# Licensed under the General Public License (version 3)
# http://opensource.org/licenses/LGPL-3.0
# Copyright (c) 2015-7, Neil Freeman <[email protected]>
# Copyright (c) 2015-9, Neil Freeman <[email protected]>

.PHONY: install upload clean deploy test
install: README.rst
python setup.py install
.PHONY: install build upload clean deploy test

README.rst: README.md
- pandoc $< -o $@
@touch $@
- python setup.py check --restructuredtext --strict
install: ; python setup.py install

test: ; python setup.py test

deploy: README.rst | clean
python3 setup.py sdist bdist_wheel
deploy: build
twine upload dist/*

build: | clean
python3 setup.py bdist_wheel --universal
python3 setup.py sdist

clean:; rm -rf dist build
4 changes: 2 additions & 2 deletions censusgeocode/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

# Licensed under the General Public License (version 3)
# http://opensource.org/licenses/LGPL-3.0
# Copyright (c) 2015-7, Neil Freeman <[email protected]>
# Copyright (c) 2015-9, Neil Freeman <[email protected]>

from .censusgeocode import CensusGeocode, benchmarks, vintages

__version__ = '0.4.3'
__version__ = '0.4.3.post1'

cg = CensusGeocode()

Expand Down
2 changes: 1 addition & 1 deletion censusgeocode/censusgeocode.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3

# Copyright (C) 2015-7 Neil Freeman
# Copyright (C) 2015-9 Neil Freeman

# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[bdist_wheel]
universal = 1

[metadata]
license_files = LICENSE.txt
10 changes: 3 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,15 @@
with open('censusgeocode/__init__.py') as i:
version = next(r for r in i.readlines() if '__version__' in r).split('=')[1].strip('"\' \n')

try:
readme = open('README.rst').read()
except IOError:
try:
readme = open('README.md').read()
except IOError:
readme = ''
with open('README.md') as f:
readme = f.read()

setup(
name='censusgeocode',
version=version,
description='Thin Python wrapper for the US Census Geocoder',
long_description=readme,
long_description_content_type='text/markdown',
keywords='census geocode api',
author='Neil Freeman',
author_email='[email protected]',
Expand Down

0 comments on commit daadf23

Please sign in to comment.