Fix linting warning

Add python 3.10 to the tests matrix

.github/workflows/main.yml

@@ -4,16 +4,17 @@ on:
   push:
     branches:
       - main
+    tags:
+      - '*'
   pull_request:
 
 jobs:
   tests:
     runs-on: ${{ matrix.os }}
-    if: github.event_name == 'pull_request'
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v2
 
@@ -37,6 +38,7 @@ jobs:
 
   build_publish:
     runs-on: ubuntu-latest
+    needs: tests
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     steps:
       - uses: actions/checkout@v2

README.md

@@ -1,9 +1,12 @@
 # digaws
 
-The digaws lookup tool displays information for a given IP address (v4 o v6) or a CIDR, sourced from the AWS official IP ranges.
+The digaws lookup tool displays information for a given IP address (both v4 and v6) or a CIDR, sourced from the AWS official IP ranges.
 In order to save bandwidth and time this tool requests the [AWS IP ranges](https://ip-ranges.amazonaws.com/ip-ranges.json) and keeps
 a cached version until a new version is published.
 
+[![PyPI version](https://badge.fury.io/py/digaws.svg)](https://pypi.org/project/digaws/)
+[![CI](https://github.com/dcarrillo/digaws/workflows/CI/badge.svg)](https://github.com/dcarrillo/digaws/actions)
+
 ## Requirements
 
 Python >= 3.7
@@ -12,8 +15,16 @@ Tests are verified on Linux, macos and Windows.
 
 ## Install
 
+### Using [pipx](https://pypa.github.io/pipx/#install-pipx) (this is the preferred way)
+
 ```bash
-pip install digaws
+pipx install digaws
+```
+
+### Using pip
+
+```bash
+pip install digaws --user
 ```
 
 ## Usage

digaws/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '1.0.2'
+__version__ = '1.0.5'
 __description__ = 'Look up canonical information for AWS IP addresses and networks'

digaws/digaws.py

@@ -127,8 +127,7 @@ class DigAWSPrettyPrinter:
                 item_dict.update({'network_border_group': prefix['network_border_group']})
             data.append(item_dict)
 
-        if data:
+        print(json.dumps(data, indent=2))
-            print(json.dumps(data, indent=2))
 
 
 class DigAWS():
@@ -182,7 +181,7 @@ class DigAWS():
                         data = [prefix for prefix in self.ipv6_prefixes
                                 if addr.subnet_of(prefix['ipv6_prefix'])]
                     except (ipaddress.AddressValueError, ValueError):
-                        raise(ValueError(f'Wrong IP or CIDR format: {address}'))
+                        raise ValueError(f'Wrong IP or CIDR format: {address}')
 
         return data
 

noxfile.py

@@ -1,10 +1,12 @@
 import nox
 
+
 nox.options.sessions = ['lint', 'typing', 'tests']
 locations = ['noxfile.py', 'setup.py', 'digaws/', 'tests/']
 
 lint_common_args = ['--max-line-length', '120']
-mypy_args = ['--ignore-missing-imports']
+mypy_args = ['--ignore-missing-imports', '--install-types', '--non-interactive']
+
 pytest_args = ['--cov=digaws', '--cov-report=', 'tests/']
 coverage_args = ['report', '--show-missing', '--fail-under=80']
 

setup.py

@@ -17,7 +17,7 @@ setup(
     url='http://github.com/dcarrillo/digaws',
     author='Daniel Carrillo',
     author_email='daniel.carrillo@gmail.com',
-    license='MIT',
+    license='Apache Software License',
     packages=['digaws'],
     zip_safe=False,
     classifiers=[

tests/test_get_aws_ip_ranges_json.py

@@ -84,4 +84,5 @@ def test_get_aws_ip_ranges_invalid_status(mocker, fs, create_cache_dir) -> None:
 
     with pytest.raises(digaws.UnexpectedRequestException) as e:
         digaws.get_aws_ip_ranges()
-        assert e.startswith('Unexpected response from')
+
+    assert e.match('^Unexpected response from')