* Adding automatic versioning to the tool.

* Adding a build script
* Adding upstream help for formatting advice

cmw/__init__.py

@@ -0,0 +1,8 @@
+#!/usr/bin/env python3
+
+import pkg_resources
+
+try:
+    __version__ = pkg_resources.get_distribution("cmw").version
+except Exception:
+    __version__ = 'unknown'

cmw/cmw.py

@@ -1,14 +1,21 @@
 #!/usr/bin/env python3
 
+from . import __version__
 import argparse
 import requests
 
-def generate_link(url, location=None, lang=None, format=None):
+def generate_link(url, location=None, lang=None, format=None, help=False):
-    link = f"https://"
+    link = f"https://{url}/"
-    if lang:
+    headers = {}
-        link = link + f"{lang}.{url}/"
+
+    if help:
+        link = link + f"/:help"
+
     else:
-        link = link + f"{url}/"
+        if lang:
+            headers = {
+                "Accept-Language": lang
+            }
 
         if location:
             link = link + f"{location}"
@@ -16,18 +23,18 @@ def generate_link(url, location=None, lang=None, format=None):
         if format:
             link = link + f"?format={format}"
 
-    return link
+    return link, headers
 
 
-def get_weather(link):
+def get_weather(link, headers):
-    result = requests.get(link)
+    result = requests.get(link, headers=headers)
     return result.text
 
 def main():
     parser = argumentparser()
     url = "wttr.in"
-    link = generate_link(url, parser.location, parser.lang, parser.format)
+    link, headers = generate_link(url, parser.location, parser.lang, parser.format, parser.format_help)
-    weather = get_weather(link)
+    weather = get_weather(link, headers)
     print(weather)
 
 
@@ -53,6 +60,19 @@ def argumentparser():
         type=str,
         help="The language to use"
     )
+
+    parser.add_argument(
+        "--format-help",
+        default=False,
+        action='store_true',
+        help="Get format help from upstream"
+    )
+
+    parser.add_argument(
+        '--version',
+        action='version',
+        version=f'%(prog)s {__version__}')
+
     return parser.parse_args()
 
 

requirements/development.txt

@@ -1 +1,2 @@
-setuptools_git >= 0.3
+setuptools-git
+setuptools-git-version

setup.py

@@ -15,7 +15,8 @@ description = 'Command line Weather (cmw)'
 setup(
     name='cmw',
     exclude_package_data={'': ['.gitignore', 'requirements/', 'setup.py']},
-    setup_requires=[ "setuptools_git >= 0.3", ],
+    version_format='{tag}_{gitsha}',
+    setup_requires=['setuptools-git', 'setuptools-git-version'],
     license='BSD',
     author='Elia El Lazkani',
     author_email='eliaellazkani@gmail.com',

setup.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python setup.py bdist_wheel