Merge branch 'main' into feature/schema-datatypes

Author: mtovts

.github/renovate.json

@@ -0,0 +1,6 @@
+{
+  "extends": [
+    "config:base",
+    ":semanticCommitTypeAll(chore)"
+  ]
+}

end_to_end_tests/golden-record/README.md

@@ -47,10 +47,10 @@ Things to know:
     1. `sync_detailed`: Blocking request that always returns a `Request`, optionally with `parsed` set if the request was successful.
     1. `asyncio`: Like `sync` but the async instead of blocking
     1. `asyncio_detailed`: Like `sync_detailed` by async instead of blocking
-     
+
 1. All path/query params, and bodies become method arguments.
 1. If your endpoint had any tags on it, the first tag will be used as a module name for the function (my_tag above)
-1. Any endpoint which did not have a tag will be in `my_test_api_client.api.default`    
+1. Any endpoint which did not have a tag will be in `my_test_api_client.api.default`
 
 ## Building / publishing this Client
 This project uses [Poetry](https://python-poetry.org/) to manage dependencies  and packaging.  Here are the basics:

end_to_end_tests/golden-record/pyproject.toml

@@ -14,7 +14,7 @@ include = ["CHANGELOG.md", "my_test_api_client/py.typed"]
 
 [tool.poetry.dependencies]
 python = "^3.6"
-httpx = ">=0.15.4,<0.19.0"
+httpx = ">=0.15.4,<0.20.0"
 attrs = ">=20.1.0,<22.0.0"
 python-dateutil = "^2.8.0"
 

openapi_python_client/__init__.py

@@ -194,7 +194,7 @@ def _build_metadata(self) -> None:
         git_ignore_path.write_text(git_ignore_template.render(), encoding=self.file_encoding)
 
     def _build_pyproject_toml(self, *, use_poetry: bool) -> None:
-        template = "pyproject.toml.jinja" if use_poetry else "pyproject_no_poetry.toml.jinja"
+        template = "pyproject.toml" if use_poetry else "pyproject_no_poetry.toml.jinja"
         pyproject_template = self.env.get_template(template)
         pyproject_path = self.project_dir / "pyproject.toml"
         pyproject_path.write_text(

openapi_python_client/templates/README.md.jinja

@@ -47,10 +47,10 @@ Things to know:
     1. `sync_detailed`: Blocking request that always returns a `Request`, optionally with `parsed` set if the request was successful.
     1. `asyncio`: Like `sync` but the async instead of blocking
     1. `asyncio_detailed`: Like `sync_detailed` by async instead of blocking
-     
+
 1. All path/query params, and bodies become method arguments.
 1. If your endpoint had any tags on it, the first tag will be used as a module name for the function (my_tag above)
-1. Any endpoint which did not have a tag will be in `{{ package_name }}.api.default`    
+1. Any endpoint which did not have a tag will be in `{{ package_name }}.api.default`
 
 ## Building / publishing this Client
 This project uses [Poetry](https://python-poetry.org/) to manage dependencies  and packaging.  Here are the basics:

openapi_python_client/templates/pyproject.toml.jinja renamed to openapi_python_client/templates/pyproject.toml

@@ -14,7 +14,7 @@ include = ["CHANGELOG.md", "{{ package_name }}/py.typed"]
 
 [tool.poetry.dependencies]
 python = "^3.6"
-httpx = ">=0.15.4,<0.19.0"
+httpx = ">=0.15.4,<0.20.0"
 attrs = ">=20.1.0,<22.0.0"
 python-dateutil = "^2.8.0"
 

poetry.lock

@@ -27,11 +27,11 @@ shellingham = "^1.3.2"
 black = "*"
 isort = "^5.0.5"
 pyyaml = "^5.3.1"
-importlib_metadata = {version = "^2.0.0", python = "<3.8"}
+importlib_metadata = {version = ">2,<5", python = "<3.8"}
 pydantic = "^1.6.1"
 attrs = "^21.0.0"
 python-dateutil = "^2.8.1"
-httpx = ">=0.15.4,<0.19.0"
+httpx = ">=0.15.4,<0.20.0"
 autoflake = "^1.4"
 typing-extensions = { version = "*", python = "<3.8" }
 

pyproject.toml

@@ -465,7 +465,7 @@ def test__build_pyproject_toml(self, mocker, use_poetry):
 
         pyproject_template = mocker.MagicMock(autospec=jinja2.Template)
         project.env = mocker.MagicMock(autospec=jinja2.Environment)
-        template_path = "pyproject.toml.jinja" if use_poetry else "pyproject_no_poetry.toml.jinja"
+        template_path = "pyproject.toml" if use_poetry else "pyproject_no_poetry.toml.jinja"
         templates = {
             template_path: pyproject_template,
         }