9 Commits

5 changed files with 23 additions and 15 deletions

View File

@ -14,12 +14,12 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.7, 3.8, 3.9] python-version: ["3.8", "3.9", "3.10", "3.11"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }} - name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2 uses: actions/setup-python@v5
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
@ -41,12 +41,12 @@ jobs:
needs: tests needs: tests
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v4
- name: Set up Python 3.8 - name: Set up Python 3.11
uses: actions/setup-python@v2 uses: actions/setup-python@v5
with: with:
python-version: 3.8 python-version: 3.11
- name: Install tools - name: Install tools
run: | run: |

View File

@ -1,22 +1,30 @@
# digaws # 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 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. a cached version until a new version is published.
![PyPI version](https://badge.fury.io/py/digaws.svg) [![PyPI version](https://badge.fury.io/py/digaws.svg)](https://pypi.org/project/digaws/)
![CI](https://github.com/dcarrillo/digaws/workflows/CI/badge.svg) [![CI](https://github.com/dcarrillo/digaws/workflows/CI/badge.svg)](https://github.com/dcarrillo/digaws/actions)
## Requirements ## Requirements
Python >= 3.7 Python >= 3.8
Tests are verified on Linux, macos and Windows. Tests are verified on Linux, macos and Windows.
## Install ## Install
### Using [pipx](https://pypa.github.io/pipx/#install-pipx) (this is the preferred way)
```bash ```bash
pip install digaws pipx install digaws
```
### Using pip
```bash
pip install digaws --user
``` ```
## Usage ## Usage

View File

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

View File

@ -181,7 +181,7 @@ class DigAWS():
data = [prefix for prefix in self.ipv6_prefixes data = [prefix for prefix in self.ipv6_prefixes
if addr.subnet_of(prefix['ipv6_prefix'])] if addr.subnet_of(prefix['ipv6_prefix'])]
except (ipaddress.AddressValueError, ValueError): except (ipaddress.AddressValueError, ValueError):
raise(ValueError(f'Wrong IP or CIDR format: {address}')) raise ValueError(f'Wrong IP or CIDR format: {address}')
return data return data

View File

@ -25,7 +25,7 @@ setup(
'License :: OSI Approved :: Apache Software License', 'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent', 'Operating System :: OS Independent',
], ],
python_requires='>=3.7', python_requires='>=3.8',
entry_points={ entry_points={
'console_scripts': ['digaws=digaws.digaws:main'] 'console_scripts': ['digaws=digaws.digaws:main']
}, },