Merge pull request #16 from google/fix-version

Remove dependency on distutils2
google · Nov 6, 2019 · d2897da · d2897da
2 parents 5ee0af0 + 1cd0bf4
commit d2897da
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/pybadges/__init__.py b/pybadges/__init__.py
@@ -36,13 +36,13 @@
 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
@@ -22,12 +22,14 @@
 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
@@ -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
@@ -18,7 +18,6 @@
 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 replace_relative_with_absolute(match):
 
 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=[