From 12cde3d7d3622465c738a2278b6164bf44e07091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Luis=20Cano=20Rodr=C3=ADguez?= Date: Fri, 26 May 2023 16:19:06 +0200 Subject: [PATCH] Adapt test_starter template to match new structure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan Luis Cano Rodríguez --- .../pyproject.toml | 40 ++++++++++++++++++- .../{src => }/requirements.txt | 6 ++- .../{{ cookiecutter.repo_name }}/src/setup.py | 39 ------------------ .../{src => }/tests/__init__.py | 0 .../{src => }/tests/pipelines/__init__.py | 0 .../{src => }/tests/test_run.py | 0 6 files changed, 42 insertions(+), 43 deletions(-) rename features/steps/test_starter/{{ cookiecutter.repo_name }}/{src => }/requirements.txt (76%) delete mode 100644 features/steps/test_starter/{{ cookiecutter.repo_name }}/src/setup.py rename features/steps/test_starter/{{ cookiecutter.repo_name }}/{src => }/tests/__init__.py (100%) rename features/steps/test_starter/{{ cookiecutter.repo_name }}/{src => }/tests/pipelines/__init__.py (100%) rename features/steps/test_starter/{{ cookiecutter.repo_name }}/{src => }/tests/test_run.py (100%) diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml index ca5524efc1..c0cadfe234 100644 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml +++ b/features/steps/test_starter/{{ cookiecutter.repo_name }}/pyproject.toml @@ -1,7 +1,43 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "{{ cookiecutter.python_package }}" +dependencies = [ + "kedro~={{ cookiecutter.kedro_version }}", + "kedro-datasets[pandas.CSVDataSet]", +] +dynamic = ["version"] + +[project.scripts] +{{ cookiecutter.repo_name }} = "{{ cookiecutter.python_package }}.__main__:main" + +[project.optional-dependencies] +docs = [ + "docutils<0.18.0", + "sphinx~=3.4.3", + "sphinx_rtd_theme==0.5.1", + "nbsphinx==0.8.1", + "nbstripout~=0.4", + "sphinx-autodoc-typehints==1.11.1", + "sphinx_copybutton==0.3.1", + "ipykernel>=5.3, <7.0", + "Jinja2<3.1.0", + "myst-parser~=0.17.2", +] + +[tool.setuptools.dynamic] +version = {attr = "{{ cookiecutter.python_package }}.__version__"} + +[tool.setuptools.packages.find] +where = ["src"] +namespaces = false + [tool.kedro] -project_name = "{{ cookiecutter.project_name }}" -project_version = "{{ cookiecutter.kedro_version }}" package_name = "{{ cookiecutter.python_package }}" +project_name = "{{ cookiecutter.project_name }}" +kedro_init_version = "{{ cookiecutter.kedro_version }}" [tool.isort] profile = "black" diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/src/requirements.txt b/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt similarity index 76% rename from features/steps/test_starter/{{ cookiecutter.repo_name }}/src/requirements.txt rename to features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt index 7e6f29ac16..50cf28b712 100644 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/src/requirements.txt +++ b/features/steps/test_starter/{{ cookiecutter.repo_name }}/requirements.txt @@ -1,3 +1,7 @@ +# Install library code +-e file:. + +# Development dependencies black~=22.0 flake8>=3.7.9, <5.0 ipython>=7.31.1, <8.0; python_version < '3.8' @@ -6,8 +10,6 @@ isort~=5.0 jupyter~=1.0 jupyterlab_server>=2.11.1, <2.16.0 jupyterlab~=3.0, <3.6.0 -kedro[pandas.CSVDataSet]=={{ cookiecutter.kedro_version }} -kedro-telemetry~=0.2.0 nbstripout~=0.4 pytest-cov~=3.0 pytest-mock>=1.7.1, <2.0 diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/src/setup.py b/features/steps/test_starter/{{ cookiecutter.repo_name }}/src/setup.py deleted file mode 100644 index af5b101519..0000000000 --- a/features/steps/test_starter/{{ cookiecutter.repo_name }}/src/setup.py +++ /dev/null @@ -1,39 +0,0 @@ -from setuptools import find_packages, setup - -entry_point = ( - "{{ cookiecutter.repo_name }} = {{ cookiecutter.python_package }}.__main__:main" -) - - -# get the dependencies and installs -with open("requirements.txt", encoding="utf-8") as f: - # Make sure we strip all comments and options (e.g "--extra-index-url") - # that arise from a modified pip.conf file that configure global options - # when running kedro build-reqs - requires = [] - for line in f: - req = line.split("#", 1)[0].strip() - if req and not req.startswith("-r"): - requires.append(req) - -setup( - name="{{ cookiecutter.python_package }}", - version="0.1", - packages=find_packages(exclude=["tests"]), - entry_points={"console_scripts": [entry_point]}, - install_requires=requires, - extras_require={ - "docs": [ - "docutils<0.18.0", - "sphinx~=3.4.3", - "sphinx_rtd_theme==0.5.1", - "nbsphinx==0.8.1", - "nbstripout~=0.4", - "sphinx-autodoc-typehints==1.11.1", - "sphinx_copybutton==0.3.1", - "ipykernel>=5.3, <7.0", - "Jinja2<3.1.0", - "myst-parser~=0.17.2", - ] - }, -) diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/src/tests/__init__.py b/features/steps/test_starter/{{ cookiecutter.repo_name }}/tests/__init__.py similarity index 100% rename from features/steps/test_starter/{{ cookiecutter.repo_name }}/src/tests/__init__.py rename to features/steps/test_starter/{{ cookiecutter.repo_name }}/tests/__init__.py diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/src/tests/pipelines/__init__.py b/features/steps/test_starter/{{ cookiecutter.repo_name }}/tests/pipelines/__init__.py similarity index 100% rename from features/steps/test_starter/{{ cookiecutter.repo_name }}/src/tests/pipelines/__init__.py rename to features/steps/test_starter/{{ cookiecutter.repo_name }}/tests/pipelines/__init__.py diff --git a/features/steps/test_starter/{{ cookiecutter.repo_name }}/src/tests/test_run.py b/features/steps/test_starter/{{ cookiecutter.repo_name }}/tests/test_run.py similarity index 100% rename from features/steps/test_starter/{{ cookiecutter.repo_name }}/src/tests/test_run.py rename to features/steps/test_starter/{{ cookiecutter.repo_name }}/tests/test_run.py