Merge pull request #376 from torsm/upgrade-grpcio

Upgrade grpc to 1.57.0

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
           go install google.golang.org/grpc/cmd/[email protected]
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
@@ -111,7 +111,7 @@ jobs:
           go-version: '^1.21'
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           powershell Install-WindowsFeature Net-Framework-Core
@@ -150,7 +150,7 @@ jobs:
           go-version: '^1.21'
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           pip install wheel
@@ -189,7 +189,7 @@ jobs:
           go-version: '^1.21'
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           pip install wheel pytest
@@ -223,7 +223,7 @@ jobs:
           path: ${{ env.GOPATH }}/src/github.com/google/fleetspeak
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         shell: bash
         run: |

fleetspeak/client-wheel/setup.py

@@ -52,6 +52,7 @@ def DataFiles(prefix_in_pkg, root_dir):
 setup(
     name="fleetspeak-client-bin",
     version=options.version,
+    packages=[],
     cmdclass={
         "bdist_wheel": BdistWheel,
     },

fleetspeak/server-wheel/setup.py

@@ -52,6 +52,7 @@ def DataFiles(prefix_in_pkg, root_dir):
 setup(
     name="fleetspeak-server-bin",
     version=options.version,
+    packages=[],
     cmdclass={
         "bdist_wheel": BdistWheel,
     },

fleetspeak_python/setup.py

@@ -23,7 +23,7 @@
 from setuptools.command.develop import develop
 from setuptools.command.sdist import sdist
 
-GRPCIO_TOOLS = "grpcio-tools==1.46.3"
+GRPCIO_VERSION = "==1.57.0"
 
 THIS_DIRECTORY = os.path.dirname(os.path.realpath(__file__))
 os.chdir(THIS_DIRECTORY)
@@ -85,7 +85,7 @@ def compile_protos():
     # grpcio-tools and then uninstalled when grr-response-proto's setup.py runs
     # and reinstalled to the version required by grr-response-proto.
     subprocess.check_call(
-        [sys.executable, "-m", "pip", "install", GRPCIO_TOOLS])
+        [sys.executable, "-m", "pip", "install", f"grpcio-tools{GRPCIO_VERSION}"])
 
   # If VERSION is present here, we're likely installing from an sdist,
   # so there's no need to compile the protos (they should be already
@@ -180,10 +180,13 @@ def find_all_modules(self):
     packages=_find_packages("fleetspeak"),
     install_requires=[
         "absl-py>=0.8.0",
-        "grpcio>=1.24.1",
+        f"grpcio{GRPCIO_VERSION}",
     ],
     extras_require={
-        "test": ["grpcio-testing==1.54.2"],
+        "test": [
+            "pytest",
+            f"grpcio-testing{GRPCIO_VERSION}",
+        ],
     },    
     package_data={
     },

go.mod

@@ -5,30 +5,30 @@ go 1.21
 require (
 	github.com/Microsoft/go-winio v0.4.12
 	github.com/go-sql-driver/mysql v1.4.1
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
+	github.com/golang/glog v1.1.0
 	github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95
 	github.com/mattn/go-sqlite3 v1.11.0
 	github.com/pires/go-proxyproto v0.6.2
 	github.com/prometheus/client_golang v1.7.1
 	github.com/shirou/gopsutil v3.20.12+incompatible
-	golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34
+	golang.org/x/sys v0.7.0
 	golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0
-	google.golang.org/grpc v1.46.0
+	google.golang.org/grpc v1.57.0
 	google.golang.org/protobuf v1.31.0
 )
 
 require (
 	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/go-ole/go-ole v1.2.4 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.10.0 // indirect
 	github.com/prometheus/procfs v0.1.3 // indirect
-	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
-	golang.org/x/text v0.3.3 // indirect
-	google.golang.org/appengine v1.4.0 // indirect
-	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	golang.org/x/net v0.9.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
 )