Fix CI with changes from huggingface-hub 0.8.0 (#227)

* Fix test script for huggingface_hub 0.8.0 release

* Fix exception type

* Fix test_save_model_with_different_name

Author: regisss

tests/onnxruntime/test_modeling_ort.py

@@ -17,6 +17,7 @@
 )
 
 import onnxruntime
+from huggingface_hub.utils import EntryNotFoundError
 from optimum.onnxruntime import (
     ONNX_WEIGHTS_NAME,
     ORTModelForCausalLM,
@@ -50,9 +51,8 @@ def test_load_model_from_hub(self):
         self.assertIsInstance(model.config, PretrainedConfig)
 
     def test_load_model_from_hub_without_onnx_model(self):
-        with self.assertRaises(Exception) as context:
+        with self.assertRaises(EntryNotFoundError):
             ORTModel.from_pretrained(self.FAIL_ONNX_MODEL_ID)
-        self.assertEqual("Not Found", context.exception.response.reason)
 
     @require_hf_token
     def test_load_model_from_hub_private(self):
@@ -72,10 +72,11 @@ def test_save_model(self):
     def test_save_model_with_different_name(self):
         with tempfile.TemporaryDirectory() as tmpdirname:
             test_model_name = "model-test.onnx"
-            local_model_path = str(Path(self.LOCAL_MODEL_PATH).joinpath("model.onnx").absolute())
-            # copy two models to simulate a optimization
-            shutil.copy(local_model_path, os.path.join(tmpdirname, test_model_name))
-            shutil.copy(local_model_path, os.path.join(tmpdirname, "model.onnx"))
+            model = ORTModel.from_pretrained(self.LOCAL_MODEL_PATH)
+
+            # save two models to simulate a optimization
+            model.save_pretrained(tmpdirname)
+            model.save_pretrained(tmpdirname, file_name=test_model_name)
 
             model = ORTModel.from_pretrained(tmpdirname, file_name=test_model_name)
 

tests/test_configuration_utils.py

@@ -16,9 +16,9 @@
 import tempfile
 import unittest
 
-from transformers.testing_utils import PASS, USER, is_staging_test
+from transformers.testing_utils import TOKEN, USER, is_staging_test
 
-from huggingface_hub import delete_repo, login
+from huggingface_hub import HfFolder, delete_repo, set_access_token
 from optimum.configuration_utils import BaseConfig
 from requests.exceptions import HTTPError
 
@@ -47,22 +47,24 @@ def test_create_and_test_config_from_and_save_pretrained(self):
 class ConfigPushToHubTester(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls._token = login(username=USER, password=PASS)
+        cls._token = TOKEN
+        set_access_token(TOKEN)
+        HfFolder.save_token(TOKEN)
 
     @classmethod
     def tearDownClass(cls):
         try:
-            delete_repo(token=cls._token, name="optimum-test-base-config")
+            delete_repo(token=cls._token, repo_id="optimum-test-base-config")
         except HTTPError:
             pass
 
         try:
-            delete_repo(token=cls._token, name="optimum-test-base-config-org", organization="valid_org")
+            delete_repo(token=cls._token, repo_id="valid_org/optimum-test-base-config-org")
         except HTTPError:
             pass
 
         try:
-            delete_repo(token=cls._token, name="optimum-test-base-dynamic-config")
+            delete_repo(token=cls._token, repo_id="optimum-test-base-dynamic-config")
         except HTTPError:
             pass