Patch API for release (#692)

This contains minor bug fixes I found after the bug bash. It also
removes a couple Swagger files.

Author: stevemessick

.swagger-codegen-ignore

@@ -1,10 +1,10 @@
 Changelog
 ====
-### 1.7
+### 1.7.3b0
 
 * Remove Swagger. No user-visible changes to the command-line tool. However, projects that
 use `kaggle/api/kaggle_api.py` may be affected. That file is deprecated and will be removed.
-Most of it functions still work, but those that involve uploading files no longer work.
+Most of its functions still work, but those that involve uploading files no longer work.
 The command-line tool uses a higher-level abstraction for uploading and client code needs 
 to be converted to use that.
 

CHANGELOG.md

@@ -251,7 +251,7 @@ def __repr__(self):
 
 
 class KaggleApi:
-  __version__ = '1.7'
+  __version__ = '1.7.3b0'
 
   CONFIG_NAME_PROXY = 'proxy'
   CONFIG_NAME_COMPETITION = 'competition'
@@ -862,7 +862,7 @@ def competition_submit_cli(self,
         return None
       else:
         raise e
-    return submit_result
+    return submit_result.message
 
   def competition_submissions(self,
                               competition,
@@ -4635,3 +4635,21 @@ def __init__(self, init_dict):
 
   def __repr__(self):
     return ''
+
+# This defines print_attributes(), which is very handy for inspecting
+# objects returned by the Kaggle API.
+
+from pprint import pprint
+from inspect import getmembers
+from types import FunctionType
+
+def attributes(obj):
+  disallowed_names = {
+    name for name, value in getmembers(type(obj))
+    if isinstance(value, FunctionType)}
+  return {
+    name: getattr(obj, name) for name in dir(obj)
+    if name[0] != '_' and name not in disallowed_names and hasattr(obj, name)}
+
+def print_attributes(obj):
+  pprint(attributes(obj))

LICENSE renamed to LICENSE.txt

@@ -1,5 +1,7 @@
 [build-system]
-requires = ["hatchling"]
+requires = [
+    "hatchling",
+]
 build-backend = "hatchling.build"
 
 [project]
@@ -11,7 +13,7 @@ description = "Access Kaggle resources anywhere"
 authors = [
     { name = "Kaggle", email = "support@kaggle.com" },
 ]
-license = { file = "LICENSE" }
+license = { file = "LICENSE.txt" }
 readme = "README.md"
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -46,6 +48,8 @@ Issues = "https://github.com/Kaggle/kaggle-api/issues"
 
 [tool.hatch.version]
 path = "src/__init__.py"
+# TODO: Remove validate-bump = false for next stable release
+validate-bump = false
 
 [tool.hatch.envs.default]
 dependencies = [

kaggle/api/kaggle_api_extended.py

@@ -2,11 +2,13 @@
 from setuptools import setup, find_packages
 
 # Note: pyproject.toml seems to be chosen by pip install over setup.py, so this
-# file is likely not being used anymore. We should verify and merge this into
-# pyproject.toml instead of maintaining both flows.
+# file should not be used anymore. However, cloudbuild.yaml still uses setup.py
+# to drive the build that is published to pypi.org. That needs to be changed
+# before this file can be removed. And, due to that, pyproject.toml needs to be
+# deleted before a release can be made.
 setup(
     name='kaggle',
-    version='1.7',
+    version='1.7.3b0',
     description='Kaggle API',
     long_description=(
         'Official API for https://www.kaggle.com, accessible using a command line '
@@ -24,7 +26,8 @@
     entry_points={'console_scripts': ['kaggle = kaggle.cli:main']},
     install_requires=[
         'six >= 1.10', 'certifi >= 2023.7.22', 'python-dateutil', 'requests',
-        'tqdm', 'python-slugify', 'urllib3', 'bleach', 'protobuf'
+        'tqdm', 'python-slugify', 'urllib3', 'bleach', 'protobuf',
+        'hatchling >= 1.27.0'
     ],
     packages=find_packages(
         where='src',

pyproject.toml

@@ -1 +1 @@
-__version__ = "1.7"
+__version__ = "1.7.3b0"

setup.py

@@ -251,7 +251,7 @@ def __repr__(self):
 
 
 class KaggleApi:
-  __version__ = '1.7'
+  __version__ = '1.7.3b0'
 
   CONFIG_NAME_PROXY = 'proxy'
   CONFIG_NAME_COMPETITION = 'competition'
@@ -862,7 +862,7 @@ def competition_submit_cli(self,
         return None
       else:
         raise e
-    return submit_result
+    return submit_result.message
 
   def competition_submissions(self,
                               competition,
@@ -4635,3 +4635,21 @@ def __init__(self, init_dict):
 
   def __repr__(self):
     return ''
+
+# This defines print_attributes(), which is very handy for inspecting
+# objects returned by the Kaggle API.
+
+from pprint import pprint
+from inspect import getmembers
+from types import FunctionType
+
+def attributes(obj):
+  disallowed_names = {
+    name for name, value in getmembers(type(obj))
+    if isinstance(value, FunctionType)}
+  return {
+    name: getattr(obj, name) for name in dir(obj)
+    if name[0] != '_' and name not in disallowed_names and hasattr(obj, name)}
+
+def print_attributes(obj):
+  pprint(attributes(obj))

src/__init__.py

@@ -2,11 +2,13 @@
 from setuptools import setup, find_packages
 
 # Note: pyproject.toml seems to be chosen by pip install over setup.py, so this
-# file is likely not being used anymore. We should verify and merge this into
-# pyproject.toml instead of maintaining both flows.
+# file should not be used anymore. However, cloudbuild.yaml still uses setup.py
+# to drive the build that is published to pypi.org. That needs to be changed
+# before this file can be removed. And, due to that, pyproject.toml needs to be
+# deleted before a release can be made.
 setup(
     name='kaggle',
-    version='1.7',
+    version='1.7.3b0',
     description='Kaggle API',
     long_description=(
         'Official API for https://www.kaggle.com, accessible using a command line '
@@ -24,7 +26,8 @@
     entry_points={'console_scripts': ['kaggle = kaggle.cli:main']},
     install_requires=[
         'six >= 1.10', 'certifi >= 2023.7.22', 'python-dateutil', 'requests',
-        'tqdm', 'python-slugify', 'urllib3', 'bleach', 'protobuf'
+        'tqdm', 'python-slugify', 'urllib3', 'bleach', 'protobuf',
+        'hatchling >= 1.27.0'
     ],
     packages=find_packages(
         where='src',

src/kaggle/api/kaggle_api_extended.py

@@ -348,7 +348,9 @@ def test_competition_a_list(self):
   def test_competition_b_submit(self):
     try:
       self.skip_submissions = False
-      api.competition_submit(up_file, description, competition)
+      result = api.competition_submit_cli(up_file, description, competition)
+      if not result or not result.startswith('Successfully submitted'):
+        self.fail(f'competition_submit failed: {result}')
     except HTTPError:
       # Handle submission limit reached gracefully (potentially skip the test)
       print('Competition submission limit reached for the day')