Merge remote-tracking branch 'upstream/main' into forest-union-3

forest-benchling · forest-benchling · commit 8bc76afa83a3 · 2021-03-15T09:37:13.000-04:00
diff --git a/dobby.toml b/dobby.toml
@@ -0,0 +1,20 @@
+[[workflows]]
+name = "Start Task"
+    [[workflows.steps]]
+    type = "SelectGitHubIssue"
+
+    [[workflows.steps]]
+    type = "SwitchBranches"
+
+[[workflows]]
+name = "Prepare Release"
+    [[workflows.steps]]
+    type = "UpdateProjectFromCommits"
+
+    [[workflows.steps]]
+    type = "Command"
+    command = "prettier --write CHANGELOG.md"
+
+[github]
+owner = "triaxtec"
+repo = "openapi-python-client"
diff --git a/end_to_end_tests/golden-record-custom/pyproject.toml b/end_to_end_tests/golden-record-custom/pyproject.toml
@@ -14,7 +14,7 @@ include = ["CHANGELOG.md", "custom_e2e/py.typed"]
 
 [tool.poetry.dependencies]
 python = "^3.6"
-httpx = ">=0.15.4,<0.17.0"
+httpx = ">=0.15.4,<0.18.0"
 attrs = "^20.1.0"
 python-dateutil = "^2.8.0"
 
diff --git a/end_to_end_tests/golden-record/pyproject.toml b/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.17.0"
+httpx = ">=0.15.4,<0.18.0"
 attrs = "^20.1.0"
 python-dateutil = "^2.8.0"
 
diff --git a/openapi_python_client/templates/pyproject.toml.jinja b/openapi_python_client/templates/pyproject.toml.jinja
@@ -14,7 +14,7 @@ include = ["CHANGELOG.md", "{{ package_name }}/py.typed"]
 
 [tool.poetry.dependencies]
 python = "^3.6"
-httpx = ">=0.15.4,<0.17.0"
+httpx = ">=0.15.4,<0.18.0"
 attrs = "^20.1.0"
 python-dateutil = "^2.8.0"
 
diff --git a/openapi_python_client/templates/setup.py.jinja b/openapi_python_client/templates/setup.py.jinja
@@ -14,6 +14,6 @@ setup(
     package_dir={"": "{{ package_name }}"},
     packages=find_packages(where="{{ package_name }}"),
     python_requires=">=3.6, <4",
-    install_requires=["httpx >= 0.15.0, < 0.17.0", "attrs >= 20.1.0", "python-dateutil >= 2.8.0, < 3"],
+    install_requires=["httpx >= 0.15.0, < 0.18.0", "attrs >= 20.1.0", "python-dateutil >= 2.8.0, < 3"],
     package_data={"": ["CHANGELOG.md"], "{{ package_name }}": ["py.typed"]},
 )
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -32,7 +32,7 @@ importlib_metadata = {version = "^2.0.0", python = "<3.8"}
 pydantic = "^1.6.1"
 attrs = "^20.1.0"
 python-dateutil = "^2.8.1"
-httpx = ">=0.15.4,<0.17.0"
+httpx = ">=0.15.4,<0.18.0"
 autoflake = "^1.4"
 
 [tool.poetry.scripts]

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ setup(`
`14`	`14`	`package_dir={"": "{{ package_name }}"},`
`15`	`15`	`packages=find_packages(where="{{ package_name }}"),`
`16`	`16`	`python_requires=">=3.6, <4",`
`17`		`- install_requires=["httpx >= 0.15.0, < 0.17.0", "attrs >= 20.1.0", "python-dateutil >= 2.8.0, < 3"],`
	`17`	`+ install_requires=["httpx >= 0.15.0, < 0.18.0", "attrs >= 20.1.0", "python-dateutil >= 2.8.0, < 3"],`
`18`	`18`	`package_data={"": ["CHANGELOG.md"], "{{ package_name }}": ["py.typed"]},`
`19`	`19`	`)`