[AUTOPR] Updates and fix warnings (#48)

* Fix formatting * Update python setuptools * Update golangci-lint * Bump version * Fix gcc warnings --------- Co-authored-by: nicolaasuni-vonage <nicola.asuni@vonage.com>
Vonage · Aug 27, 2024 · 82263c3 · 82263c3
1 parent 9297f17
commit 82263c3
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 18 deletions.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -87,7 +87,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install --upgrade virtualenv
+          python -m pip install --upgrade setuptools virtualenv
       - name: set RELEASE number
         run: echo ${GITHUB_RUN_NUMBER} > RELEASE
       - name: test

diff --git a/README.md b/README.md
@@ -7,8 +7,9 @@
 *Numerical Encoding for Short Codes or E.164 LVN*
 
 Also includes:
-    * *prefixkey*  To encode number prefixes or E.164 LVN as uint64.
-    * *countrykey* To encode ISO 3166 alpha-2 country code as uint16.
+
+- *prefixkey*  To encode number prefixes or E.164 LVN as uint64.
+- *countrykey* To encode ISO 3166 alpha-2 country code as uint16.
 
 [![check](https://github.com/Vonage/numkey/actions/workflows/check.yaml/badge.svg)](https://github.com/Vonage/numkey/actions/workflows/check.yaml)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.6.14
+1.6.15
diff --git a/c/doc/Doxyfile b/c/doc/Doxyfile
@@ -32,7 +32,7 @@ PROJECT_NAME           = "NumKey"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 1.6.14
+PROJECT_NUMBER = 1.6.15
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer

diff --git a/cgo/.golangci.yml b/cgo/.golangci.yml
@@ -42,6 +42,10 @@ linters-settings:
         allow:
           - $gostd
           - github.com/stretchr
+  gosec:
+    excludes:
+      # Flags for potentially-unsafe casting of ints, similar problem to globally-disabled G103
+      - G115
 
 issues:
   exclude-dirs:
@@ -70,3 +74,4 @@ linters:
     - tagliatelle    # Checks the struct tags. [fast: true, auto-fix: false]
     - testpackage    # linter that makes you use a separate _test package [fast: true, auto-fix: false]
     - varnamelen    # checks that the length of a variable's name matches its scope [fast: false, auto-fix: false]
+    - exportloopref # deprecated
diff --git a/cgo/Makefile b/cgo/Makefile
@@ -50,7 +50,7 @@ GOFMT=$(shell which gofmt)
 GOTEST=GOPATH=$(GOPATH) $(shell which gotest)
 GODOC=GOPATH=$(GOPATH) $(shell which godoc)
 GOLANGCILINT=$(BINUTIL)/golangci-lint
-GOLANGCILINTVERSION=v1.60.1
+GOLANGCILINTVERSION=v1.60.3
 
 # Directory containing the source code
 SRCDIR=./src

diff --git a/go/.golangci.yml b/go/.golangci.yml
@@ -42,6 +42,10 @@ linters-settings:
         allow:
           - $gostd
           - github.com/stretchr
+  gosec:
+    excludes:
+      # Flags for potentially-unsafe casting of ints, similar problem to globally-disabled G103
+      - G115
 
 issues:
   exclude-dirs:
@@ -70,3 +74,4 @@ linters:
     - tagliatelle    # Checks the struct tags. [fast: true, auto-fix: false]
     - testpackage    # linter that makes you use a separate _test package [fast: true, auto-fix: false]
     - varnamelen    # checks that the length of a variable's name matches its scope [fast: false, auto-fix: false]
+    - exportloopref # deprecated
diff --git a/go/Makefile b/go/Makefile
@@ -50,7 +50,7 @@ GOFMT=$(shell which gofmt)
 GOTEST=GOPATH=$(GOPATH) $(shell which gotest)
 GODOC=GOPATH=$(GOPATH) $(shell which godoc)
 GOLANGCILINT=$(BINUTIL)/golangci-lint
-GOLANGCILINTVERSION=v1.60.1
+GOLANGCILINTVERSION=v1.60.3
 
 # Directory containing the source code
 SRCDIR=./src

diff --git a/python/Makefile b/python/Makefile
@@ -77,8 +77,8 @@ venv: clean version
 	source venv/bin/activate \
 	&& python --version \
 	&& pip install --upgrade pip \
-	&& pip install --pre wheel build black pytest pip-upgrade \
-	&& pip install -e .[test]
+	&& pip install --upgrade --pre wheel build black pytest setuptools \
+	&& pip install --use-pep517 --no-build-isolation -e .[test]
 
 # Set the version from VERSION file
 .PHONY: version

diff --git a/python/numkey/pynumkey.c b/python/numkey/pynumkey.c
@@ -136,14 +136,14 @@ static PyObject* py_decode_countrykey(PyObject *Py_UNUSED(ignored), PyObject *ar
 static PyMethodDef PyNumKeyMethods[] =
 {
     // NUMKEY
-    {"numkey", (PyCFunction)py_numkey, METH_VARARGS|METH_KEYWORDS, PYNUMKEY_DOCSTRING},
-    {"decode_numkey", (PyCFunction)py_decode_numkey, METH_VARARGS|METH_KEYWORDS, PYDECODENUMKEY_DOCSTRING},
-    {"compare_numkey_country", (PyCFunction)py_compare_numkey_country, METH_VARARGS|METH_KEYWORDS, PYCOMPARENUMKEYCOUNTRY_DOCSTRING},
-    {"numkey_hex", (PyCFunction)py_numkey_hex, METH_VARARGS|METH_KEYWORDS, PYNUMKEYHEX_DOCSTRING},
-    {"parse_numkey_hex", (PyCFunction)py_parse_numkey_hex, METH_VARARGS|METH_KEYWORDS, PYPARSENUMKEYSTRING_DOCSTRING},
-    {"prefixkey", (PyCFunction)py_prefixkey, METH_VARARGS|METH_KEYWORDS, PYPREFIXKEY_DOCSTRING},
-    {"countrykey", (PyCFunction)py_countrykey, METH_VARARGS|METH_KEYWORDS, COUNTRYKEY_DOCSTRING},
-    {"decode_countrykey", (PyCFunction)py_decode_countrykey, METH_VARARGS|METH_KEYWORDS, DECODECOUNTRYKEY_DOCSTRING},
+    {"numkey", (PyCFunction)(void(*)(void))py_numkey, METH_VARARGS|METH_KEYWORDS, PYNUMKEY_DOCSTRING},
+    {"decode_numkey", (PyCFunction)(void(*)(void))py_decode_numkey, METH_VARARGS|METH_KEYWORDS, PYDECODENUMKEY_DOCSTRING},
+    {"compare_numkey_country", (PyCFunction)(void(*)(void))py_compare_numkey_country, METH_VARARGS|METH_KEYWORDS, PYCOMPARENUMKEYCOUNTRY_DOCSTRING},
+    {"numkey_hex", (PyCFunction)(void(*)(void))py_numkey_hex, METH_VARARGS|METH_KEYWORDS, PYNUMKEYHEX_DOCSTRING},
+    {"parse_numkey_hex", (PyCFunction)(void(*)(void))py_parse_numkey_hex, METH_VARARGS|METH_KEYWORDS, PYPARSENUMKEYSTRING_DOCSTRING},
+    {"prefixkey", (PyCFunction)(void(*)(void))py_prefixkey, METH_VARARGS|METH_KEYWORDS, PYPREFIXKEY_DOCSTRING},
+    {"countrykey", (PyCFunction)(void(*)(void))py_countrykey, METH_VARARGS|METH_KEYWORDS, COUNTRYKEY_DOCSTRING},
+    {"decode_countrykey", (PyCFunction)(void(*)(void))py_decode_countrykey, METH_VARARGS|METH_KEYWORDS, DECODECOUNTRYKEY_DOCSTRING},
     {NULL, NULL, 0, NULL}
 };
 

diff --git a/python/setup.py b/python/setup.py
@@ -30,7 +30,7 @@ def run(self):
 
 setup(
     name="numkey",
-    version="1.6.14.1",
+    version="1.6.15.1",
     keywords=("numkey E.164 shortcode lvn did encoding"),
     description="NumKey Bindings for Python",
     long_description=read("../README.md"),