0.6.3

phalt · Sep 28, 2023 · 382b81f · 382b81f
1 parent 3038f5e
commit 382b81f
Show file tree

Hide file tree

Showing 33 changed files with 52 additions and 35 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,10 +50,10 @@ jobs:
       #----------------------------------------------
       - name: Black check
         run: |
-          poetry run black src/ --check
+          poetry run black clientele/ --check
       - name: Ruff check
         run: |
-          poetry run ruff src/
+          poetry run ruff clientele/
       - name: Test with pytest
         run: |
           poetry run pytest -vv
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change log
 
+## 0.6.3
+
+* Packaged application installs in the correct location. Resolving [#6](https://github.com/phalt/clientele/issues/6)
+* Updated pyproject.toml to include a better selection of links.
+
 ## 0.6.2
 
 * Ignore optional URL query parameters if they are `None`.

diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ release:  ## Build a new version and release it
 	poetry publish
 
 mypy: ## Run a static syntax check
-	poetry run mypy src/
+	poetry run mypy .
 
 lint: ## Format the code correctly
 	poetry run black .

diff --git a/src/cli.py → clientele/cli.py b/src/cli.py → clientele/cli.py
@@ -14,7 +14,7 @@ def version():
     """
     Print the current version of clientele
     """
-    from src.settings import VERSION
+    from clientele.settings import VERSION
 
     print(f"clientele {VERSION}")
 
@@ -81,7 +81,7 @@ def generate(url, file, output, asyncio):
 
     console = Console()
 
-    from src.generator import Generator
+    from clientele.generator import Generator
 
     assert url or file, "Must pass either a URL or a file"
 

diff --git a/src/client_template/MANIFEST.md → clientele/client_template/MANIFEST.md b/src/client_template/MANIFEST.md → clientele/client_template/MANIFEST.md
diff --git a/src/__init__.py → clientele/client_template/__init__.py b/src/__init__.py → clientele/client_template/__init__.py
diff --git a/src/client_template/client.py → clientele/client_template/client.py b/src/client_template/client.py → clientele/client_template/client.py
diff --git a/src/client_template/http.py → clientele/client_template/http.py b/src/client_template/http.py → clientele/client_template/http.py
diff --git a/src/client_template/schemas.py → clientele/client_template/schemas.py b/src/client_template/schemas.py → clientele/client_template/schemas.py
diff --git a/src/constants_template.py → clientele/constants_template.py b/src/constants_template.py → clientele/constants_template.py
diff --git a/src/generator.py → clientele/generator.py b/src/generator.py → clientele/generator.py
@@ -5,11 +5,11 @@
 
 from openapi_core import Spec
 
-from src.generators.clients import ClientsGenerator
-from src.generators.http import HTTPGenerator
-from src.generators.schemas import SchemasGenerator
-from src.settings import CLIENT_TEMPLATE_ROOT, CONSTANTS_ROOT, VERSION
-from src.writer import write_to_manifest
+from clientele.generators.clients import ClientsGenerator
+from clientele.generators.http import HTTPGenerator
+from clientele.generators.schemas import SchemasGenerator
+from clientele.settings import CLIENT_TEMPLATE_ROOT, CONSTANTS_ROOT, VERSION
+from clientele.writer import write_to_manifest
 
 
 class Generator:

diff --git a/src/client_template/__init__.py → clientele/generators/__init__.py b/src/client_template/__init__.py → clientele/generators/__init__.py
diff --git a/src/generators/clients.py → clientele/generators/clients.py b/src/generators/clients.py → clientele/generators/clients.py
@@ -5,10 +5,10 @@
 from pydantic import BaseModel
 from rich.console import Console
 
-from src.generators.http import HTTPGenerator
-from src.generators.schemas import SchemasGenerator
-from src.settings import templates
-from src.utils import (
+from clientele.generators.http import HTTPGenerator
+from clientele.generators.schemas import SchemasGenerator
+from clientele.settings import templates
+from clientele.utils import (
     class_name_titled,
     clean_prop,
     create_query_args,
@@ -17,7 +17,7 @@
     get_type,
     schema_ref,
 )
-from src.writer import write_to_client
+from clientele.writer import write_to_client
 
 console = Console()
 

diff --git a/src/generators/http.py → clientele/generators/http.py b/src/generators/http.py → clientele/generators/http.py
@@ -3,8 +3,8 @@
 from openapi_core import Spec
 from rich.console import Console
 
-from src.settings import templates
-from src.writer import write_to_http
+from clientele.settings import templates
+from clientele.writer import write_to_http
 
 console = Console()
 

diff --git a/src/generators/schemas.py → clientele/generators/schemas.py b/src/generators/schemas.py → clientele/generators/schemas.py
@@ -3,15 +3,15 @@
 from openapi_core import Spec
 from rich.console import Console
 
-from src.settings import templates
-from src.utils import (
+from clientele.settings import templates
+from clientele.utils import (
     class_name_titled,
     clean_prop,
     get_schema_from_ref,
     get_type,
     schema_ref,
 )
-from src.writer import write_to_schemas
+from clientele.writer import write_to_schemas
 
 console = Console()
 

diff --git a/clientele/settings.py b/clientele/settings.py
@@ -0,0 +1,12 @@
+from os.path import abspath, dirname
+
+from jinja2 import Environment, PackageLoader
+
+CLIENT_TEMPLATE_ROOT = (
+    dirname(dirname(abspath(__file__))) + "/clientele/client_template/"
+)
+TEMPLATES_ROOT = dirname(dirname(abspath(__file__))) + "/clientele/templates/"
+CONSTANTS_ROOT = dirname(dirname(abspath(__file__))) + "/clientele/"
+VERSION = "0.6.3"
+
+templates = Environment(loader=PackageLoader("clientele", "templates"))
diff --git a/src/templates/async_methods.jinja2 → clientele/templates/async_methods.jinja2 b/src/templates/async_methods.jinja2 → clientele/templates/async_methods.jinja2
diff --git a/src/templates/basic_client.jinja2 → clientele/templates/basic_client.jinja2 b/src/templates/basic_client.jinja2 → clientele/templates/basic_client.jinja2
diff --git a/src/templates/bearer_client.jinja2 → clientele/templates/bearer_client.jinja2 b/src/templates/bearer_client.jinja2 → clientele/templates/bearer_client.jinja2
diff --git a/src/templates/client.jinja2 → clientele/templates/client.jinja2 b/src/templates/client.jinja2 → clientele/templates/client.jinja2
diff --git a/src/templates/get_method.jinja2 → clientele/templates/get_method.jinja2 b/src/templates/get_method.jinja2 → clientele/templates/get_method.jinja2
diff --git a/src/templates/post_method.jinja2 → clientele/templates/post_method.jinja2 b/src/templates/post_method.jinja2 → clientele/templates/post_method.jinja2
diff --git a/src/templates/schema_class.jinja2 → clientele/templates/schema_class.jinja2 b/src/templates/schema_class.jinja2 → clientele/templates/schema_class.jinja2
diff --git a/src/templates/schema_helpers.jinja2 → clientele/templates/schema_helpers.jinja2 b/src/templates/schema_helpers.jinja2 → clientele/templates/schema_helpers.jinja2
diff --git a/src/templates/sync_methods.jinja2 → clientele/templates/sync_methods.jinja2 b/src/templates/sync_methods.jinja2 → clientele/templates/sync_methods.jinja2
diff --git a/src/utils.py → clientele/utils.py b/src/utils.py → clientele/utils.py
diff --git a/src/writer.py → clientele/writer.py b/src/writer.py → clientele/writer.py
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change log
 
+## 0.6.3
+
+* Packaged application installs in the correct location. Resolving [#6](https://github.com/phalt/clientele/issues/6)
+* Updated pyproject.toml to include a better selection of links.
+
 ## 0.6.2
 
 * Ignore optional URL query parameters if they are `None`.

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,15 +1,20 @@
 [tool.poetry]
 name = "clientele"
-version = "0.6.2"
+version = "0.6.3"
 description = "Generate loveable Python HTTP API Clients"
 authors = ["Paul Hallett <paulandrewhallett@gmail.com>"]
 license = "MIT"
 readme = "README.md"
-packages = [{include = "src"}]
+packages = [{include = "clientele"}]
 homepage = "https://phalt.github.io/clientele/"
 
+[tool.poetry.urls]
+changelog = "https://phalt.github.io/clientele/CHANGELOG/"
+documentation = "https://phalt.github.io/clientele/"
+issues = "https://github.com/phalt/clientele/issues"
+
 [tool.poetry.scripts]
-clientele = "src.cli:cli_group"
+clientele = "clientele.cli:cli_group"
 
 [tool.poetry.dependencies]
 python = "^3.9"

diff --git a/src/generators/__init__.py b/src/generators/__init__.py
diff --git a/src/settings.py b/src/settings.py
diff --git a/tests/async_test_client/MANIFEST.md b/tests/async_test_client/MANIFEST.md
@@ -9,7 +9,7 @@ pipx install clientele
 
 API VERSION: 0.1.0
 OPENAPI VERSION: 3.0.2
-CLIENTELE VERSION: 0.6.2
+CLIENTELE VERSION: 0.6.3
 
 Generated using this command:
 

diff --git a/tests/test_client/MANIFEST.md b/tests/test_client/MANIFEST.md
@@ -9,7 +9,7 @@ pipx install clientele
 
 API VERSION: 0.1.0
 OPENAPI VERSION: 3.0.2
-CLIENTELE VERSION: 0.6.2
+CLIENTELE VERSION: 0.6.3
 
 Generated using this command: