Skip to content

Commit

Permalink
Renamed package in preparation for pypi publishing
Browse files Browse the repository at this point in the history
  • Loading branch information
owais committed Jan 25, 2021
1 parent dc32a79 commit 49137fc
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 48 deletions.
53 changes: 10 additions & 43 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,46 +1,13 @@
.PHONY: test publish install clean clean-build clean-pyc clean-test build
.PHONY: tools
tools:
pip install sdist twine[readme_renderer]

install:
python setup.py install
.PHONY: build
build:
python setup.py sdist
twine check dist/*tar.gz

clean: clean-build clean-pyc

clean-build:
python setup.py clean
rm -fr build/
rm -fr dist/
rm -fr .eggs/
rm -fr .cache/
find . -name '*.egg-info' -exec rm -fr {} +
find . -name '*.egg' -exec rm -rf {} +

clean-pyc:
find . -name '*.pyc' -exec rm -f {} +
find . -name '*.pyo' -exec rm -f {} +
find . -name '*~' -exec rm -f {} +
find . -name '__pycache__' -exec rm -fr {} +

clean-test:
rm -f .coverage

test:
py.test -s --cov=elasticsearch_opentracing

build:
python setup.py build

publish: test build
@git diff-index --quiet HEAD || (echo "git has uncommitted changes. Refusing to publish." && false)
awk 'BEGIN { FS = "." }; { printf("%d.%d.%d", $$1, $$2, $$3+1) }' VERSION > VERSION.incr
mv VERSION.incr VERSION
git add VERSION
git commit -m "Update VERSION"
git tag `cat VERSION`
git push
git push --tags
python setup.py register -r pypi || (echo "Was unable to register to pypi, aborting publish." && false)
python setup.py sdist upload -r pypi || (echo "Was unable to upload to pypi, publish failed." && false)
@echo
@echo "\033[92mSUCCESS: published v`cat VERSION` \033[0m"
@echo

.PHONY: publish
publish:
twine upload dist/signalfx-instrumentation-elasticsearch-${VERSION}.tar.gz
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Instalation

Run the following command:

$ pip install elasticsearch_opentracing
$ pip install signalfx-instrumentation-elasticsearch

Getting started
===============
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.4post1
1.0.0
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

version = open('VERSION').read()
setup(
name='elasticsearch_opentracing',
name='signalfx-instrumentation-elasticsearch',
version=version,
url='https://github.com/opentracing-contrib/python-elasticsearch/',
download_url='https://github.com/opentracing-contrib/python-elasticsearch/tarball/'+version,
url='https://github.com/signalfx/python-elasticsearch/',
download_url='https://github.com/signalfx/python-elasticsearch/tarball/'+version,
license='Apache License 2.0',
author='Carlos Alberto Cortez',
author_email='calberto.cortez@gmail.com',
Expand Down

0 comments on commit 49137fc

Please sign in to comment.