Merge pull request #76 from RIPE-NCC/add_regions

Add regions support
Fix sec issues

Author: iannuzzelli

.github/workflows/python-package-test.yml

@@ -18,9 +18,9 @@ jobs:
         python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -35,17 +35,17 @@ jobs:
     runs-on: ubuntu-latest
     needs: test
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
         with:
           python-version: '3.11'
       - name: Build release
         run: |
           python -m pip install --upgrade build
           python -m build
       - name: Upload dist
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: release-dists
           path: dist/
@@ -56,13 +56,13 @@ jobs:
     needs: build
     steps:
       - name: Retrieve dist
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: release-dists
           path: dist/
       - name: Push to test pypi
         # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@release/v1.13
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # release/v1.13
         with:
           user: __token__
           password: ${{ secrets.PYPI_TEST_API_TOKEN }}

.github/workflows/python-package.yml

@@ -18,9 +18,9 @@ jobs:
         python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -35,17 +35,17 @@ jobs:
     runs-on: ubuntu-latest
     needs: test
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
         with:
           python-version: '3.11'
       - name: Build release
         run: |
           python -m pip install --upgrade build
           python -m build
       - name: Upload dist
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: release-dists
           path: dist/
@@ -56,13 +56,13 @@ jobs:
     needs: build
     steps:
       - name: Retrieve dist
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           name: release-dists
           path: dist/
       - name: Push to pypi
         # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@release/v1.13
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # release/v1.13
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

CHANGES.rst

@@ -1,6 +1,18 @@
 Releases History
 ================
 
+2.3.0 (release 2026-05-20)
+--------------------------
+New features:
+~~~~~~~~~~~~~
+- Add support for ``region`` and ``countries`` probe source types
+
+Changes:
+~~~~~~~~
+- Pin GitHub Actions to full-length commit SHAs in CI workflows
+- Replace ``exec()``-based version loading with regex parsing
+- Upgrade requests to ~=2.34.2
+
 2.2.0 (release 2025-12-08)
 --------------------------
 Changes:

docs/conf.py

@@ -16,8 +16,9 @@
 import os
 
 
-__version__ = None
-exec(open("../ripe/atlas/cousteau/version.py").read())
+import re
+with open("../ripe/atlas/cousteau/version.py") as _f:
+    __version__ = re.search(r'^__version__\s*=\s*"([^"]+)"', _f.read()).group(1)
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

docs/use.rst

@@ -71,7 +71,7 @@ Examples:
 Measurement Sources
 -------------------
 The second step is to create the measurements source(s). In order to do that you have to create an AtlasSource object using the arguments type, value, requested, and optionally tags.
-Type as described in the `API docs`_ should be one of the "area", "country", "prefix", "asn", "probes", "msm". Value is the actual value of the type and requested is the number of probes that will be selected from this source.
+Type as described in the `API docs`_ should be one of the "area", "country", "prefix", "asn", "probes", "msm", "region", "countries". Value is the actual value of the type and requested is the number of probes that will be selected from this source.
 Optionally you can use tags argument, which has to be a dictionary like {"include": [], "exclude": []}.
 Examples:
 

ripe/atlas/cousteau/request.py

@@ -218,7 +218,7 @@ class AtlasChangeRequest(AtlasRequest):
         "action": "add|remove",
         "requested": probe_number,
         # when action=remove only probes is supported
-        "type": "area|country|asn|prefix|msm|probes",
+        "type": "area|country|asn|prefix|msm|probes|region|countries",
         "value": probe_values
     }]
     """

ripe/atlas/cousteau/source.py

@@ -31,7 +31,7 @@ class AtlasSource(object):
     """
 
     # available types
-    types_available = ["area", "country", "prefix", "asn", "probes", "msm"]
+    types_available = ["area", "country", "prefix", "asn", "probes", "msm", "region", "countries"]
 
     def __init__(self, **kwargs):
         if "requested" in kwargs:

ripe/atlas/cousteau/version.py

@@ -13,4 +13,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = "2.2.0"
+__version__ = "2.3.0"

setup.py

@@ -1,14 +1,14 @@
 #!/usr/bin/env python
+import re
 from os.path import abspath, dirname, join
 from setuptools import setup
 
-# import manually __version__ variable
-__version__ = None
-exec(open("ripe/atlas/cousteau/version.py").read())
+with open("ripe/atlas/cousteau/version.py") as _f:
+    __version__ = re.search(r'^__version__\s*=\s*"([^"]+)"', _f.read()).group(1)
 
 install_requires = [
     "python-dateutil",
-    "requests~=2.32.0",
+    "requests~=2.34.2",
     "websocket-client~=1.9.0",
     "typing-extensions",
 ]

tests/__init__.py

@@ -49,7 +49,7 @@
         "type": {
             "type": "string",
             "enum": [
-                "area", "country", "prefix", "asn", "probes", "msm"
+                "area", "country", "prefix", "asn", "probes", "msm", "region", "countries"
             ]
         },
         "value": {
@@ -98,7 +98,7 @@
         },
         "type": {
             "type": "string",
-            "enum": ["area", "country", "prefix", "asn", "probes", "msm"]
+            "enum": ["area", "country", "prefix", "asn", "probes", "msm", "region", "countries"]
         },
         "value": {
             "type": "string",