Merge pull request #303 from uploadcare/chore/prepare-v6.1

Prepare v6.1

Author: evgkirov

.github/workflows/publish.yml

@@ -20,7 +20,7 @@ jobs:
           virtualenvs-create: true
           virtualenvs-in-project: false
       - name: Install Dependencies
-        run: poetry install
+        run: poetry install  --with dev
       - name: Set PyPI token
         run: poetry config pypi-token.pypi "${{ secrets.PYPI_API_TOKEN }}"
       - name: Publish package

.github/workflows/test.yml

@@ -32,7 +32,7 @@ jobs:
           virtualenvs-in-project: false
       - name: Install dependencies
         run: |
-          poetry install
+          poetry install --with dev
       - name: Run linters
         run: make lint
 
@@ -59,7 +59,7 @@ jobs:
           virtualenvs-in-project: false
       - name: Install dependencies
         run: |
-          poetry install
+          poetry install --with dev
       - name: Test with pytest
         run: |
           make test-functional
@@ -92,7 +92,7 @@ jobs:
           virtualenvs-in-project: false
       - name: install dependencies
         run: |
-          poetry install
+          poetry install --with dev
       - name: install specific django version
         run: |
           poetry run pip install django~=${{ matrix.django-version }}
@@ -133,7 +133,7 @@ jobs:
           virtualenvs-in-project: false
       - name: install dependencies
         run: |
-          poetry install
+          poetry install --with dev
       - name: install specific django version
         run: |
           poetry run pip install django~=${{ matrix.django-version }}
@@ -164,7 +164,7 @@ jobs:
           virtualenvs-in-project: false
       - name: install dependencies
         run: |
-          poetry install
+          poetry install --with dev
       - name: install specific django version
         run: |
           poetry run pip install django~=${{ matrix.django-version }}
@@ -192,7 +192,11 @@ jobs:
           virtualenvs-in-project: false
       - name: Install dependencies
         run: |
-          poetry install
+          poetry install --with dev
       - name: Test with pytest
         run: |
           make test-integration
+        env:
+          UPLOADCARE_PUBLIC_KEY: ${{ secrets.UPLOADCARE_PUBLIC_KEY }}
+          UPLOADCARE_SECRET_KEY: ${{ secrets.UPLOADCARE_SECRET_KEY }}
+

HISTORY.md

@@ -6,6 +6,10 @@ The format is based on [Keep a
 Changelog](https://keepachangelog.com/en/1.0.0/), and this project
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [6.1.0](https://github.com/uploadcare/pyuploadcare/compare/v6.0.0...v6.1.0) - 2025-02-15
+
+- Bumped the `httpx` dependency to `0.28.1` [#301](https://github.com/uploadcare/pyuploadcare/pull/301)
+
 ## [6.0.0](https://github.com/uploadcare/pyuploadcare/compare/v5.1.0...v6.0.0) - 2024-09-19
 
 ### Changed

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2024 Uploadcare, Inc
+Copyright (c) 2025 Uploadcare, Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

docs/conf.py

@@ -48,7 +48,7 @@
 
 # General information about the project.
 project = "PyUploadcare"
-copyright = "2011-2024, Uploadcare Inc"
+copyright = "2011-2025, Uploadcare Inc"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyuploadcare"
-version = "6.0.0"
+version = "6.1.0"
 description = "Python library for Uploadcare.com"
 authors = ["Uploadcare Inc <[email protected]>"]
 readme = "README.md"
@@ -36,7 +36,10 @@ Django = {version = ">=2.2", optional = true}
 [tool.poetry.extras]
 django = ["Django"]
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev]
+optional = true
+
+[tool.poetry.group.dev.dependencies]
 pytest = "^7.4"
 black = "^24.3.0"
 isort = "^5.13.2"

pyuploadcare/__init__.py

@@ -1,5 +1,5 @@
 # isort: skip_file
-__version__ = "6.0.0"
+__version__ = "6.1.0"
 
 from pyuploadcare.resources.file import File  # noqa: F401
 from pyuploadcare.resources.file_group import FileGroup  # noqa: F401

pyuploadcare/api/entities.py

@@ -130,7 +130,7 @@ class ApllicationDataDetails(Entity):
 
 class ApplicationDataBase(Entity):
     data: Optional[Union[Dict[str, Any], ApllicationDataDetails]] = Field(
-        default_factory=dict
+        default_factory=lambda: {}
     )
     version: str
     datetime_created: datetime

tests/conftest.py

@@ -58,8 +58,8 @@ def big_file(temp_directory):
 
 @pytest.fixture(scope="session")
 def setup_settings():
-    conf.pub_key = "demopublickey"
-    conf.secret = "demosecretkey"
+    conf.pub_key = os.environ.get("UPLOADCARE_PUBLIC_KEY", "demopublickey")
+    conf.secret = os.environ.get("UPLOADCARE_SECRET_KEY", "demosecretkey")
     conf.api_version = "0.7"
     conf.api_base = "https://api.uploadcare.com/"
     conf.upload_base = "https://upload.uploadcare.com/"
@@ -88,9 +88,9 @@ def vcr_config():
 @pytest.fixture(scope="module")
 def uploadcare(setup_settings):
     uc = Uploadcare(
-        public_key="demopublickey",
-        secret_key="demosecretkey",
-        api_version=conf.api_version,
+        public_key=setup_settings.pub_key,
+        secret_key=setup_settings.secret,
+        api_version=setup_settings.api_version,
         multipart_min_file_size=setup_settings.multipart_min_file_size,
         multipart_chunk_size=setup_settings.multipart_chunk_size,
     )

tests/integration/ucare_cli/test_sync_files.py

@@ -58,7 +58,7 @@ def test_sync_uuids(sync_path, uploadcare):
 
     main(
         arg_namespace(
-            f"--pub_key demopublickey --secret demosecretkey "
+            f"--pub_key {uploadcare.public_key} --secret {uploadcare.secret_key} "
             f"sync --no-input {sync_path} --uuids {' '.join(uuids)}"
         )
     )
@@ -84,7 +84,7 @@ def test_sync_patterns(sync_path, uploadcare):
 
     main(
         arg_namespace(
-            "--pub_key demopublickey --secret demosecretkey "
+            f"--pub_key {uploadcare.public_key} --secret {uploadcare.secret_key} "
             "sync --no-input {} --uuids {}".format(
                 sync_path + "/${uuid}_${ext}", " ".join(uuids)
             )