Merge pull request #6 from dcarrillo/1.0.4

Return an empty array when there is no data for json output

.github/workflows/main.yml

@@ -4,12 +4,13 @@ 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]
@@ -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

@@ -4,6 +4,9 @@ The digaws lookup tool displays information for a given IP address (v4 o v6) or
 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)
+![CI](https://github.com/dcarrillo/digaws/workflows/CI/badge.svg)
+
 ## Requirements
 
 Python >= 3.7

digaws/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '1.0.2'
+__version__ = '1.0.4'
 __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():

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')