diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 660b87e6c63c..e53652bb3c38 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -1,31 +1,38 @@
 {
   lib,
   buildPythonPackage,
-  db-dtypes,
   fetchPypi,
-  freezegun,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   google-api-core,
   google-cloud-bigquery-storage,
   google-cloud-core,
+  google-resumable-media,
+  grpcio,
+  proto-plus,
+  protobuf,
+  python-dateutil,
+  requests,
+
+  # optional-dependencies
+  pyarrow,
+  db-dtypes,
+  pandas,
+  tqdm,
+  ipython,
+
+  #  tests
+  freezegun,
   google-cloud-datacatalog,
   google-cloud-storage,
   google-cloud-testutils,
-  google-resumable-media,
-  grpcio,
-  ipython,
   mock,
-  pandas,
-  proto-plus,
-  protobuf,
   psutil,
-  pyarrow,
   pytest-xdist,
   pytestCheckHook,
-  python-dateutil,
-  pythonOlder,
-  requests,
-  setuptools,
-  tqdm,
 }:
 
 buildPythonPackage rec {
@@ -33,8 +40,6 @@ buildPythonPackage rec {
   version = "3.31.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_bigquery";
     inherit version;
@@ -44,15 +49,15 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
-    grpcio
     google-api-core
-    google-cloud-core
     google-cloud-bigquery-storage
+    google-cloud-core
     google-resumable-media
+    grpcio
     proto-plus
     protobuf
-    requests
     python-dateutil
+    requests
   ] ++ google-api-core.optional-dependencies.grpc;
 
   optional-dependencies = {
@@ -73,13 +78,13 @@ buildPythonPackage rec {
   nativeCheckInputs =
     [
       freezegun
+      google-cloud-datacatalog
+      google-cloud-storage
       google-cloud-testutils
       mock
       psutil
-      google-cloud-datacatalog
-      google-cloud-storage
-      pytestCheckHook
       pytest-xdist
+      pytestCheckHook
     ]
     ++ optional-dependencies.pandas
     ++ optional-dependencies.ipython;
@@ -91,39 +96,41 @@ buildPythonPackage rec {
 
   disabledTests = [
     # requires credentials
-    "test_bigquery_magic"
     "TestBigQuery"
-    "test_context_with_no_query_cache_from_context"
     "test_arrow_extension_types_same_for_storage_and_REST_APIs_894"
+    "test_bigquery_magic"
+    "test_context_with_no_query_cache_from_context"
+    "test_dry_run"
     "test_list_rows_empty_table"
     "test_list_rows_page_size"
-    "test_list_rows_range_csv"
     "test_list_rows_range"
-    "test_list_rows_scalars_extreme"
+    "test_list_rows_range_csv"
     "test_list_rows_scalars"
-    "test_dry_run"
+    "test_list_rows_scalars_extreme"
     "test_session"
+
     # Mocking of _ensure_bqstorage_client fails
     "test_to_arrow_ensure_bqstorage_client_wo_bqstorage"
+
     # requires network
+    "test__initiate_resumable_upload"
+    "test__initiate_resumable_upload_mtls"
+    "test__initiate_resumable_upload_with_retry"
+    "test_context_with_custom_connection"
+    "test_context_with_default_connection"
     "test_dbapi_create_view"
     "test_list_rows_nullable_scalars_dtypes"
     "test_parameterized_types_round_trip"
     "test_structs"
-    "test_table_snapshots"
-    "test__initiate_resumable_upload"
-    "test__initiate_resumable_upload_mtls"
-    "test__initiate_resumable_upload_with_retry"
     "test_table_clones"
-    "test_context_with_default_connection"
-    "test_context_with_custom_connection"
+    "test_table_snapshots"
   ];
 
   disabledTestPaths = [
     # Tests require credentials
-    "tests/system/test_query.py"
     "tests/system/test_job_retry.py"
     "tests/system/test_pandas.py"
+    "tests/system/test_query.py"
   ];
 
   pythonImportsCheck = [
@@ -131,11 +138,11 @@ buildPythonPackage rec {
     "google.cloud.bigquery_v2"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Google BigQuery API client library";
     homepage = "https://github.com/googleapis/python-bigquery";
     changelog = "https://github.com/googleapis/python-bigquery/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 }