From 0fd6de06016c9ccab749e76257ea96ce1ba9424b Mon Sep 17 00:00:00 2001 From: staticdev Date: Mon, 27 Dec 2021 22:49:30 +0100 Subject: [PATCH] Update to standard structure --- .github/workflows/tests.yml | 6 ++---- pyproject.toml | 2 +- {inquirer => src/inquirer}/__init__.py | 6 +++--- {inquirer => src/inquirer}/errors.py | 0 {inquirer => src/inquirer}/events.py | 0 {inquirer => src/inquirer}/prompt.py | 0 {inquirer => src/inquirer}/questions.py | 0 {inquirer => src/inquirer}/render/__init__.py | 0 {inquirer => src/inquirer}/render/console/__init__.py | 0 {inquirer => src/inquirer}/render/console/_checkbox.py | 0 {inquirer => src/inquirer}/render/console/_confirm.py | 0 {inquirer => src/inquirer}/render/console/_editor.py | 0 {inquirer => src/inquirer}/render/console/_list.py | 0 {inquirer => src/inquirer}/render/console/_password.py | 0 {inquirer => src/inquirer}/render/console/_path.py | 0 {inquirer => src/inquirer}/render/console/_text.py | 0 {inquirer => src/inquirer}/render/console/base.py | 0 {inquirer => src/inquirer}/shortcuts.py | 0 {inquirer => src/inquirer}/themes.py | 0 19 files changed, 6 insertions(+), 8 deletions(-) rename {inquirer => src/inquirer}/__init__.py (73%) rename {inquirer => src/inquirer}/errors.py (100%) rename {inquirer => src/inquirer}/events.py (100%) rename {inquirer => src/inquirer}/prompt.py (100%) rename {inquirer => src/inquirer}/questions.py (100%) rename {inquirer => src/inquirer}/render/__init__.py (100%) rename {inquirer => src/inquirer}/render/console/__init__.py (100%) rename {inquirer => src/inquirer}/render/console/_checkbox.py (100%) rename {inquirer => src/inquirer}/render/console/_confirm.py (100%) rename {inquirer => src/inquirer}/render/console/_editor.py (100%) rename {inquirer => src/inquirer}/render/console/_list.py (100%) rename {inquirer => src/inquirer}/render/console/_password.py (100%) rename {inquirer => src/inquirer}/render/console/_path.py (100%) rename {inquirer => src/inquirer}/render/console/_text.py (100%) rename {inquirer => src/inquirer}/render/console/base.py (100%) rename {inquirer => src/inquirer}/shortcuts.py (100%) rename {inquirer => src/inquirer}/themes.py (100%) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e791e98f..7abac910 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,10 +2,8 @@ name: Tests on: - push: - branches: [ master ] - pull_request: - branches: [ master ] + - push + - pull_request jobs: tests: diff --git a/pyproject.toml b/pyproject.toml index 5a2593e2..94116e49 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ python-editor = ">=1.0.4" pexpect = ">=4.8.0" [tool.coverage.paths] -source = ["inquirer", "*/site-packages"] +source = ["src", "*/site-packages"] tests = ["tests", "*/tests"] [tool.coverage.run] diff --git a/inquirer/__init__.py b/src/inquirer/__init__.py similarity index 73% rename from inquirer/__init__.py rename to src/inquirer/__init__.py index 31552435..ccc14e01 100644 --- a/inquirer/__init__.py +++ b/src/inquirer/__init__.py @@ -1,5 +1,5 @@ -from .prompt import prompt -from .questions import ( +from inquirer.prompt import prompt +from inquirer.questions import ( Text, Editor, Password, @@ -11,7 +11,7 @@ load_from_json, load_from_list, ) -from .shortcuts import text, editor, password, confirm, list_input, checkbox +from inquirer.shortcuts import text, editor, password, confirm, list_input, checkbox __all__ = [ "prompt", diff --git a/inquirer/errors.py b/src/inquirer/errors.py similarity index 100% rename from inquirer/errors.py rename to src/inquirer/errors.py diff --git a/inquirer/events.py b/src/inquirer/events.py similarity index 100% rename from inquirer/events.py rename to src/inquirer/events.py diff --git a/inquirer/prompt.py b/src/inquirer/prompt.py similarity index 100% rename from inquirer/prompt.py rename to src/inquirer/prompt.py diff --git a/inquirer/questions.py b/src/inquirer/questions.py similarity index 100% rename from inquirer/questions.py rename to src/inquirer/questions.py diff --git a/inquirer/render/__init__.py b/src/inquirer/render/__init__.py similarity index 100% rename from inquirer/render/__init__.py rename to src/inquirer/render/__init__.py diff --git a/inquirer/render/console/__init__.py b/src/inquirer/render/console/__init__.py similarity index 100% rename from inquirer/render/console/__init__.py rename to src/inquirer/render/console/__init__.py diff --git a/inquirer/render/console/_checkbox.py b/src/inquirer/render/console/_checkbox.py similarity index 100% rename from inquirer/render/console/_checkbox.py rename to src/inquirer/render/console/_checkbox.py diff --git a/inquirer/render/console/_confirm.py b/src/inquirer/render/console/_confirm.py similarity index 100% rename from inquirer/render/console/_confirm.py rename to src/inquirer/render/console/_confirm.py diff --git a/inquirer/render/console/_editor.py b/src/inquirer/render/console/_editor.py similarity index 100% rename from inquirer/render/console/_editor.py rename to src/inquirer/render/console/_editor.py diff --git a/inquirer/render/console/_list.py b/src/inquirer/render/console/_list.py similarity index 100% rename from inquirer/render/console/_list.py rename to src/inquirer/render/console/_list.py diff --git a/inquirer/render/console/_password.py b/src/inquirer/render/console/_password.py similarity index 100% rename from inquirer/render/console/_password.py rename to src/inquirer/render/console/_password.py diff --git a/inquirer/render/console/_path.py b/src/inquirer/render/console/_path.py similarity index 100% rename from inquirer/render/console/_path.py rename to src/inquirer/render/console/_path.py diff --git a/inquirer/render/console/_text.py b/src/inquirer/render/console/_text.py similarity index 100% rename from inquirer/render/console/_text.py rename to src/inquirer/render/console/_text.py diff --git a/inquirer/render/console/base.py b/src/inquirer/render/console/base.py similarity index 100% rename from inquirer/render/console/base.py rename to src/inquirer/render/console/base.py diff --git a/inquirer/shortcuts.py b/src/inquirer/shortcuts.py similarity index 100% rename from inquirer/shortcuts.py rename to src/inquirer/shortcuts.py diff --git a/inquirer/themes.py b/src/inquirer/themes.py similarity index 100% rename from inquirer/themes.py rename to src/inquirer/themes.py