2.1.0 updates (#789)

GreyNoise-Intelligence · Feb 7, 2024 · 5566308 · 5566308
1 parent dca211e
commit 5566308
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 15 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.1
+current_version = 2.1.0
 tag = False
 commit = False
 

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -132,7 +132,7 @@ jobs:
 
   sonarcloud:
     docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/openjdk:21.0
     steps:
       - checkout
       - attach_workspace:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,25 @@
 Changelog
 =========
 
+Version `2.1.0`_
+================
+**Date**: February 07, 2024
+
+* API client:
+
+  * None
+
+* CLI:
+
+  * Fixed stats command display to show correct countries
+  * Fixed similar command to handle non-noise IP response
+
+* Dependencies:
+
+  * Updated requests to version 2.31.0
+  * Updated cachetools to version 5.3.1
+  * Removed ipaddress as a required package
+
 Version `2.0.1`_
 ================
 **Date**: April 14, 2023
@@ -363,3 +382,4 @@ Version `0.2.0`_
 .. _`1.3.0`: https://github.com/GreyNoise-Intelligence/pygreynoise/compare/v1.2.1...1.3.0
 .. _`2.0.0`: https://github.com/GreyNoise-Intelligence/pygreynoise/compare/v1.3.0...HEAD
 .. _`2.0.1`: https://github.com/GreyNoise-Intelligence/pygreynoise/compare/v2.0.0...2.0.1
+.. _`2.1.0`: https://github.com/GreyNoise-Intelligence/pygreynoise/compare/v2.0.1...2.1.0
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -21,11 +21,11 @@
 # -- Project information -----------------------------------------------------
 
 project = "greynoise"
-copyright = "2018-2022, GreyNoise Intelligence"
+copyright = "2018-2024, GreyNoise Intelligence"
 author = "GreyNoise Intelligence"
 
 # The full version, including alpha/beta/rc tags
-release = "2.0.1"
+release = "2.1.0"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/requirements/common.txt b/requirements/common.txt
@@ -1,12 +1,11 @@
 Click==8.1.3
 ansimarkup==1.5.0
-cachetools==5.3.0;python_version>='3'
+cachetools==5.3.1;python_version>='3'
 colorama==0.4.6
 click-default-group==1.2.2
 click-repl==0.2.0
 dict2xml==1.7.3;python_version>='3'
-ipaddress==1.0.23
 jinja2==3.1.2;python_version>='3.6'
 more-itertools==9.1.0;python_version>='3'
-requests==2.28.2
+requests==2.31.0
 six==1.16.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1,6 +1,6 @@
 # Requirements needed to develop the application
 -r test.txt
 advbumpversion==1.2.0
-ipython==8.13.2;python_version>='3'
+ipython==8.14.0;python_version>='3'
 pre-commit==3.3.2
 tox==4.4.5
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -4,7 +4,7 @@ flake8<5.0.4;python_version<'3.8'
 flake8==6.0.0;python_version>='3.8'
 isort<5.12.0;python_version<'3.8'
 isort==5.12.0;python_version>='3.8'
-mock==5.0.1;python_version>='3.6'
+mock==5.1.0;python_version>='3.6'
 pylint<2.16.2;python_version=='3.6' # pyup: ignore
 pylint==2.17.4;python_version>='3.7'
 pytest-cov==4.0.0;python_version>='3.6'
@@ -14,4 +14,4 @@ restructuredtext-lint==1.4.0
 twine<4.0.2;python_version<'3.7'
 twine==4.0.2;python_version>='3.7'
 yamllint==1.28.0;python_version=='3.6'
-yamllint==1.29.0;python_version>='3.7'
+yamllint==1.32.0;python_version>='3.7'
diff --git a/setup.py b/setup.py
@@ -19,7 +19,6 @@ def read(fname):
     "click-default-group",
     "click-repl",
     "dict2xml",
-    "ipaddress",
     "jinja2",
     "more-itertools",
     "requests",
@@ -28,7 +27,7 @@ def read(fname):
 
 setup(
     name="greynoise",
-    version="2.0.1",
+    version="2.1.0",
     description="Abstraction to interact with GreyNoise API.",
     url="https://greynoise.io/",
     author="GreyNoise Intelligence",

diff --git a/src/greynoise/__version__.py b/src/greynoise/__version__.py
@@ -5,4 +5,4 @@
 __maintainer__ = "GreyNoise Intelligence"
 __email__ = "[email protected]"
 __status__ = "BETA"
-__version__ = "2.0.1"
+__version__ = "2.1.0"
diff --git a/src/greynoise/cli/templates/stats.txt.j2 b/src/greynoise/cli/templates/stats.txt.j2
@@ -21,12 +21,12 @@
 
 {%- if result.stats.source_countries %}
 <header>Source Countries</header>:
-{{- macros.column_verbose_list(result.stats.countries, "country") }}
+{{- macros.column_verbose_list(result.stats.source_countries, "country") }}
 {%- endif %}
 
 {%- if result.stats.destination_countries %}
 <header>Destination Countries</header>:
-{{- macros.column_verbose_list(result.stats.countries, "country") }}
+{{- macros.column_verbose_list(result.stats.destination_countries, "country") }}
 {%- endif %}
 
 {%- if result.stats.operating_systems %}