Update helpers.

Author: Lispython

Makefile

@@ -12,22 +12,26 @@ default: help
 include tools/Makefile
 
 
-#version := $(shell sh -c "egrep -oe '__version__\s+=\s+(.*)' ./pyprometheus/__init__.py | sed 's/ //g' | sed \"s/'//g\" | sed 's/__version__=//g'")
+version := $(shell sh -c "egrep -oe '__version__\s+=\s+(.*)' ./pyprometheus/__init__.py | sed 's/ //g' | sed \"s/'//g\" | sed 's/__version__=//g'")
 
-version := $(shell sh -c "$(DOCKER_RUN_COMMAND) 'python setup.py --version'")
+#version := $(shell sh -c "$(DOCKER_RUN_COMMAND) 'python setup.py --version'")
 clean-pyc:
 	find . -name '*.pyc' -exec rm -f {} +
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
+	find . -name "__pycache__" -exec rm -rf {} +
 
 help:
 	@echo "Available commands:"
 	@sed -n '/^[a-zA-Z0-9_.]*:/s/:.*//p' <Makefile | sort
 
 
+release:
+	git tag -f v$(version) && git push origin v$(version)
+
 publish: clean-pyc
 	@echo "Create release $(version) and upload to pypi"
-	git tag -f v$(version) && git push --tags
+
 	$(DOCKER_RUN_COMMAND) "python setup.py sdist bdist_wheel"
 	$(DOCKER_RUN_COMMAND) 'for d in dist/* ; do twine register "$$d"; done;'
 	$(DOCKER_RUN_COMMAND) "twine upload dist/*"

pyprometheus/__init__.py

@@ -18,7 +18,7 @@
 
 __license__ = "BSD, see LICENSE for more details"
 
-__version__ = '0.0.1'
+__version__ = '0.0.2'
 
 __version_info__ = list(map(int, __version__.split('.')))
 

pyprometheus/registry.py

@@ -12,6 +12,7 @@
 """
 
 
+
 class BaseRegistry(object):
     """Link with metrics collectors
     """

setup.py

@@ -24,9 +24,8 @@
     version = str(ast.literal_eval(_version_re.search(
         f.read().decode('utf-8')).groups()[0]))
 
-
 install_require = []
-tests_require = [x.strip() for x in open("tests_requirements.txt").readlines() if x.strip()]
+tests_require = [x.strip() for x in open("tests_requirements.txt").readlines() if (x.strip() and not x.strip().startswith('#'))]
 
 
 def read_description():
@@ -60,7 +59,7 @@ def run_tests(self):
     author='Alexandr Lispython',
     author_email='[email protected]',
     url='https://github.com/Lispython/pyprometheus',
-    description='Prometheus python client (unofficial)',
+    description='Prometheus python client and instrumentation library',
     long_description=read_description(),
     packages=find_packages(exclude=("tests", "tests.*",)),
     zip_safe=False,

tools/Dockerfile

@@ -24,15 +24,16 @@ RUN echo 'eval "$(pyenv init -)"' >> ~/.bash_profile
 
 RUN exec $SHELL
 
-RUN pyenv install 3.2  && \
+RUN pyenv install 2.7 && \
+    pyenv install 3.2  && \
     pyenv install 3.3.0 && \
     pyenv install 3.4.0 && \
     pyenv install 3.5.0 && \
     pyenv install 3.6.0 && \
     pyenv install 3.7-dev && \
     pyenv install pypy-4.0.1
 
-RUN pyenv local 3.2 3.3.0 3.4.0 3.5.0 3.6.0 3.7-dev pypy-4.0.1
+# RUN pyenv local 2.7 3.2 3.3.0 3.4.0 3.5.0 3.6.0 3.7-dev pypy-4.0.1
 
 RUN pip install -U pip setuptools wheel==0.30.0a0 pyparsing==2.1.10 twine
 RUN pip install -U plop gprof2dot ipython

tox.ini

@@ -10,6 +10,6 @@ envlist = py27#, py33, py34, py35
 deps = -rtests_requirements.txt
 
 commands =
-    pyenv local
+    pyenv local 2.7 3.2 3.3.0 3.4.0 3.5.0 3.6.0 3.7-dev pypy-4.0.1
     #pip install -e .[tests]
     uwsgi --pyrun setup.py --pyargv test --sharedarea=100 --enable-threads