From 1cd0bf4208e85527cfa24ac7203a2df07a76775a Mon Sep 17 00:00:00 2001 From: Brian Quinlan Date: Wed, 6 Nov 2019 10:57:52 -0800 Subject: [PATCH] Remove dependency on distutils2 --- pybadges/__init__.py | 2 +- pybadges/__main__.py | 4 +++- pybadges/version.py | 3 ++- setup.py | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pybadges/__init__.py b/pybadges/__init__.py index dd605ee..ad889c2 100644 --- a/pybadges/__init__.py +++ b/pybadges/__init__.py @@ -36,13 +36,13 @@ import mimetypes from typing import Optional import urllib.parse from xml.dom import minidom -from version import __version__ import jinja2 import requests from pybadges import text_measurer from pybadges import precalculated_text_measurer +from pybadges.version import __version__ _JINJA2_ENVIRONMENT = jinja2.Environment( diff --git a/pybadges/__main__.py b/pybadges/__main__.py index 02cadd4..d0fa722 100644 --- a/pybadges/__main__.py +++ b/pybadges/__main__.py @@ -22,12 +22,14 @@ import argparse import sys import tempfile import webbrowser + import pybadges -from version import __version__ +from pybadges.version import __version__ def main(): parser = argparse.ArgumentParser( + 'pybadges', description='generate a github-style badge given some text and colors') parser.add_argument( diff --git a/pybadges/version.py b/pybadges/version.py index 475f113..ae031a1 100644 --- a/pybadges/version.py +++ b/pybadges/version.py @@ -11,4 +11,5 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -__version__='2.2.0' + +__version__='2.2.1' # Also change in setup.py. diff --git a/setup.py b/setup.py index f65b39e..83b0671 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,6 @@ import base64 import re from setuptools import setup -from distutils2 import get_version def get_long_description(): """Transform README.md into a usable long description. @@ -41,7 +40,7 @@ def get_long_description(): setup( name='pybadges', - version= get_version('pybadges/version.py'), + version= '2.2.1', # Also change in version.py. author='Brian Quinlan', author_email='brian@sweetapp.com', classifiers=[