Merge pull request #17 from chr0mag/python-3.10

Add Python 3.10 support
chr0mag · Dec 23, 2021 · c989da1 · c989da1
2 parents c4e8b55 + 8ceda5b
commit c989da1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/python-tests.yaml b/.github/workflows/python-tests.yaml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9]
+        python-version: ['3.8', '3.9', '3.10']
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 .idea
+*.iml
+**/.pytest_cache
 python/dist
 python/geoipsets.egg-info
 python/build

diff --git a/python/geoipsets/VERSION b/python/geoipsets/VERSION
@@ -1 +1 @@
-2.2.5
+2.3.1
diff --git a/python/geoipsets/maxmind.py b/python/geoipsets/maxmind.py
@@ -178,7 +178,8 @@ def build_sets(self, country_code_map: dict, zip_ref: ZipFile, dir_prefix: str,
                             f.write(net + ",\n")
 
                 # this feels dirty
-                for nf_set_file in nftset_dir.iterdir():
-                    if nf_set_file.is_file():  # not strictly needed
-                        with open(nf_set_file, 'a') as f:
-                            f.write("}\n")
+                if self.nf_tables:
+                    for nf_set_file in nftset_dir.iterdir():
+                        if nf_set_file.is_file():  # not strictly needed
+                            with open(nf_set_file, 'a') as f:
+                                f.write("}\n")
diff --git a/python/setup.py b/python/setup.py
@@ -28,6 +28,7 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
     packages=find_packages(exclude=("tests",)),
     include_package_data=True,

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 setuptools>=51.1.2
-requests>=2.25.1
+requests>=2.25.1
+pytest>=6.2.5