numerapi 2.23.0.dev3__tar.gz → 2.23.2__tar.gz

{numerapi-2.23.0.dev3 → numerapi-2.23.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numerapi
-Version: 2.23.0.dev3
+Version: 2.23.2
 Summary: Automatically download and upload data for the Numerai machine learning competition
 Home-page: https://github.com/uuazed/numerapi
 Maintainer: uuazed

{numerapi-2.23.0.dev3 → numerapi-2.23.2}/numerapi/__init__.py

@@ -3,9 +3,9 @@
 from importlib.metadata import version, PackageNotFoundError
 
 try:
-    __version__ = version("package-name")
+    __version__ = version("numerapi")
 except PackageNotFoundError:
-    __version__ = 'unknown'
+    __version__ = "unknown"
 
 
 # pylint: disable=wrong-import-position

{numerapi-2.23.0.dev3 → numerapi-2.23.2}/numerapi/base_api.py

@@ -14,7 +14,6 @@ import requests
 from numerapi import utils
 
 API_TOURNAMENT_URL = "https://api-tournament.numer.ai"
-_DEFAULT_TOURNAMENT = object()
 
 
 class Api:
@@ -623,7 +622,6 @@ class Api:
 
     def list_rounds(
         self,
-        tournament: int | None | object = _DEFAULT_TOURNAMENT,
         number: int | None = None,
         target: str | None = None,
         status: str | None = None,
@@ -632,8 +630,6 @@ class Api:
         """List rounds with the filters supported by the round resolver.
 
         Args:
-            tournament (int, optional): tournament filter, defaults to the API
-                instance tournament. Pass `None` to omit the tournament filter
             number (int, optional): round number filter
             target (str, optional): round target filter
             status (str, optional): round status filter. One of `upcoming`,
@@ -677,10 +673,8 @@ class Api:
               }
             }
         """
-        if tournament is _DEFAULT_TOURNAMENT:
-            tournament = self.tournament_id if self.tournament_id else None
         arguments = {
-            "tournament": tournament,
+            "tournament": self.tournament_id,
             "number": number,
             "target": target,
             "status": None if status is None else status.upper(),
@@ -1133,7 +1127,6 @@ class Api:
         version: str | None = None,
         day: int | None = None,
         resolved: bool | None = None,
-        tournament: int | None = None,
         last_n_rounds: int | None = None,
         distinct_on_round: bool | None = None,
     ) -> List[Dict]:
@@ -1195,7 +1188,7 @@ class Api:
             "version": version,
             "day": day,
             "resolved": resolved,
-            "tournament": self.tournament_id if tournament is None else tournament,
+            "tournament": self.tournament_id,
             "lastNRounds": last_n_rounds,
             "distinctOnRound": distinct_on_round,
         }

{numerapi-2.23.0.dev3 → numerapi-2.23.2}/numerapi/utils.py

@@ -14,6 +14,8 @@ import tqdm
 
 logger = logging.getLogger(__name__)
 
+DOWNLOAD_CHUNK_SIZE = 1024 * 1024  # 1 MiB
+
 
 def load_secrets() -> tuple:
     """load secrets from environment variables or dotenv file"""
@@ -96,9 +98,9 @@ def download_file(url: str, dest_path: str, show_progress_bars: bool = True):
     # Update progress bar to reflect how much of the file is already downloaded
     pbar.update(file_size)
     with open(temp_path, "ab") as dest_file:
-        for chunk in req.iter_content(1024):
+        for chunk in req.iter_content(DOWNLOAD_CHUNK_SIZE):
             dest_file.write(chunk)
-            pbar.update(1024)
+            pbar.update(len(chunk))
     # move temp file to target destination
     os.replace(temp_path, dest_path)
     return dest_path

{numerapi-2.23.0.dev3 → numerapi-2.23.2}/numerapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numerapi
-Version: 2.23.0.dev3
+Version: 2.23.2
 Summary: Automatically download and upload data for the Numerai machine learning competition
 Home-page: https://github.com/uuazed/numerapi
 Maintainer: uuazed

{numerapi-2.23.0.dev3 → numerapi-2.23.2}/setup.py

@@ -5,7 +5,7 @@ def load(path):
     return open(path, "r").read()
 
 
-numerapi_version = "2.23.0.dev3"
+numerapi_version = "2.23.2"
 
 
 classifiers = [

{numerapi-2.23.0.dev3 → numerapi-2.23.2}/tests/test_base_api.py

@@ -230,15 +230,15 @@ def test_list_rounds(api):
 
 
 @responses.activate
-def test_list_rounds_without_tournament_filter(api):
+def test_list_rounds_uses_api_tournament_id_by_default(api):
     api.tournament_id = 11
     data = {"data": {"rounds": []}}
     responses.add(responses.POST, base_api.API_TOURNAMENT_URL, json=data)
 
-    api.list_rounds(tournament=None)
+    api.list_rounds()
 
     request_body = json.loads(responses.calls[0].request.body)
-    assert request_body["variables"]["tournament"] is None
+    assert request_body["variables"]["tournament"] == 11
 
 
 @responses.activate

{numerapi-2.23.0.dev3 → numerapi-2.23.2}/tests/test_cli.py

@@ -1,8 +1,11 @@
+import importlib
+import importlib.metadata
 import os
 import pytest
 from click.testing import CliRunner
 from unittest.mock import patch
 
+import numerapi
 from numerapi import cli
 
 
@@ -117,3 +120,19 @@ def test_version():
     result = CliRunner().invoke(cli.version)
     # just testing if calling works fine
     assert result.exit_code == 0
+
+
+def test_version_uses_numerapi_distribution_name(monkeypatch):
+    called_package_names = []
+
+    def mock_version(package_name):
+        called_package_names.append(package_name)
+        return "2.23.1"
+
+    with monkeypatch.context() as context:
+        context.setattr(importlib.metadata, "version", mock_version)
+        importlib.reload(numerapi)
+        assert called_package_names == ["numerapi"]
+        assert numerapi.__version__ == "2.23.1"
+
+    importlib.reload(numerapi)