From 5bca731263350af65c2bdecd47b5d2c6ebe04928 Mon Sep 17 00:00:00 2001 From: Dmitry Sorokin Date: Wed, 23 Aug 2023 11:06:17 +0100 Subject: [PATCH 1/4] move for spaceflights Signed-off-by: Dmitry Sorokin --- .../{setup.cfg => .flake8} | 0 .../src/pyproject.toml | 31 +++++++++++++++ .../{{ cookiecutter.repo_name }}/src/setup.py | 39 ------------------- 3 files changed, 31 insertions(+), 39 deletions(-) rename spaceflights/{{ cookiecutter.repo_name }}/{setup.cfg => .flake8} (100%) create mode 100644 spaceflights/{{ cookiecutter.repo_name }}/src/pyproject.toml delete mode 100644 spaceflights/{{ cookiecutter.repo_name }}/src/setup.py diff --git a/spaceflights/{{ cookiecutter.repo_name }}/setup.cfg b/spaceflights/{{ cookiecutter.repo_name }}/.flake8 similarity index 100% rename from spaceflights/{{ cookiecutter.repo_name }}/setup.cfg rename to spaceflights/{{ cookiecutter.repo_name }}/.flake8 diff --git a/spaceflights/{{ cookiecutter.repo_name }}/src/pyproject.toml b/spaceflights/{{ cookiecutter.repo_name }}/src/pyproject.toml new file mode 100644 index 00000000..402d9589 --- /dev/null +++ b/spaceflights/{{ cookiecutter.repo_name }}/src/pyproject.toml @@ -0,0 +1,31 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "{{ cookiecutter.python_package }}" +version = "0.1" +dynamic = ["dependencies"] + +[tool.setuptools.packages.find] +exclude = ["tests"] + +[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] +dependencies = {file = "requirements.txt"} \ No newline at end of file diff --git a/spaceflights/{{ cookiecutter.repo_name }}/src/setup.py b/spaceflights/{{ cookiecutter.repo_name }}/src/setup.py deleted file mode 100644 index 392f4360..00000000 --- a/spaceflights/{{ 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("--"): - 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", - "myst-parser~=0.17.2", - "sphinx-autodoc-typehints==1.11.1", - "sphinx_copybutton==0.3.1", - "ipykernel>=5.3, <7.0", - "Jinja2<3.1.0", - ] - }, -) From 03488c414e6759aa6152f6420a5b047ab3eb1a9e Mon Sep 17 00:00:00 2001 From: Dmitry Sorokin Date: Wed, 23 Aug 2023 11:18:14 +0100 Subject: [PATCH 2/4] set flake8 for all starters Signed-off-by: Dmitry Sorokin --- .../{{ cookiecutter.repo_name }}/{setup.cfg => .flake8} | 0 .../{{ cookiecutter.repo_name }}/{setup.cfg => .flake8} | 0 pandas-iris/{{ cookiecutter.repo_name }}/{setup.cfg => .flake8} | 0 pyspark-iris/{{ cookiecutter.repo_name }}/{setup.cfg => .flake8} | 0 pyspark/{{ cookiecutter.repo_name }}/{setup.cfg => .flake8} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename astro-airflow-iris/{{ cookiecutter.repo_name }}/{setup.cfg => .flake8} (100%) rename databricks-iris/{{ cookiecutter.repo_name }}/{setup.cfg => .flake8} (100%) rename pandas-iris/{{ cookiecutter.repo_name }}/{setup.cfg => .flake8} (100%) rename pyspark-iris/{{ cookiecutter.repo_name }}/{setup.cfg => .flake8} (100%) rename pyspark/{{ cookiecutter.repo_name }}/{setup.cfg => .flake8} (100%) diff --git a/astro-airflow-iris/{{ cookiecutter.repo_name }}/setup.cfg b/astro-airflow-iris/{{ cookiecutter.repo_name }}/.flake8 similarity index 100% rename from astro-airflow-iris/{{ cookiecutter.repo_name }}/setup.cfg rename to astro-airflow-iris/{{ cookiecutter.repo_name }}/.flake8 diff --git a/databricks-iris/{{ cookiecutter.repo_name }}/setup.cfg b/databricks-iris/{{ cookiecutter.repo_name }}/.flake8 similarity index 100% rename from databricks-iris/{{ cookiecutter.repo_name }}/setup.cfg rename to databricks-iris/{{ cookiecutter.repo_name }}/.flake8 diff --git a/pandas-iris/{{ cookiecutter.repo_name }}/setup.cfg b/pandas-iris/{{ cookiecutter.repo_name }}/.flake8 similarity index 100% rename from pandas-iris/{{ cookiecutter.repo_name }}/setup.cfg rename to pandas-iris/{{ cookiecutter.repo_name }}/.flake8 diff --git a/pyspark-iris/{{ cookiecutter.repo_name }}/setup.cfg b/pyspark-iris/{{ cookiecutter.repo_name }}/.flake8 similarity index 100% rename from pyspark-iris/{{ cookiecutter.repo_name }}/setup.cfg rename to pyspark-iris/{{ cookiecutter.repo_name }}/.flake8 diff --git a/pyspark/{{ cookiecutter.repo_name }}/setup.cfg b/pyspark/{{ cookiecutter.repo_name }}/.flake8 similarity index 100% rename from pyspark/{{ cookiecutter.repo_name }}/setup.cfg rename to pyspark/{{ cookiecutter.repo_name }}/.flake8 From bacd216402c8660f78a428702fdcd1d7fb2b9847 Mon Sep 17 00:00:00 2001 From: Dmitry Sorokin Date: Wed, 23 Aug 2023 12:42:16 +0100 Subject: [PATCH 3/4] move to pyproject for all starters Signed-off-by: Dmitry Sorokin --- .../src/pyproject.toml | 31 +++++++++++++++ .../{{ cookiecutter.repo_name }}/src/setup.py | 39 ------------------- .../src/pyproject.toml | 31 +++++++++++++++ .../{{ cookiecutter.repo_name }}/src/setup.py | 39 ------------------- .../src/pyproject.toml | 31 +++++++++++++++ .../{{ cookiecutter.repo_name }}/src/setup.py | 39 ------------------- .../src/pyproject.toml | 31 +++++++++++++++ .../{{ cookiecutter.repo_name }}/src/setup.py | 39 ------------------- .../src/pyproject.toml | 31 +++++++++++++++ .../{{ cookiecutter.repo_name }}/src/setup.py | 39 ------------------- .../src/pyproject.toml | 2 +- 11 files changed, 156 insertions(+), 196 deletions(-) create mode 100644 astro-airflow-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml delete mode 100644 astro-airflow-iris/{{ cookiecutter.repo_name }}/src/setup.py create mode 100644 databricks-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml delete mode 100644 databricks-iris/{{ cookiecutter.repo_name }}/src/setup.py create mode 100644 pandas-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml delete mode 100644 pandas-iris/{{ cookiecutter.repo_name }}/src/setup.py create mode 100644 pyspark-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml delete mode 100644 pyspark-iris/{{ cookiecutter.repo_name }}/src/setup.py create mode 100644 pyspark/{{ cookiecutter.repo_name }}/src/pyproject.toml delete mode 100644 pyspark/{{ cookiecutter.repo_name }}/src/setup.py diff --git a/astro-airflow-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml b/astro-airflow-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml new file mode 100644 index 00000000..ea581e70 --- /dev/null +++ b/astro-airflow-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml @@ -0,0 +1,31 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "{{ cookiecutter.python_package }}" +version = "0.1" +dynamic = ["dependencies"] + +[tool.setuptools.packages.find] +exclude = ["tests"] + +[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] +dependencies = {file = "requirements.txt"} diff --git a/astro-airflow-iris/{{ cookiecutter.repo_name }}/src/setup.py b/astro-airflow-iris/{{ cookiecutter.repo_name }}/src/setup.py deleted file mode 100644 index 392f4360..00000000 --- a/astro-airflow-iris/{{ 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("--"): - 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", - "myst-parser~=0.17.2", - "sphinx-autodoc-typehints==1.11.1", - "sphinx_copybutton==0.3.1", - "ipykernel>=5.3, <7.0", - "Jinja2<3.1.0", - ] - }, -) diff --git a/databricks-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml b/databricks-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml new file mode 100644 index 00000000..69076577 --- /dev/null +++ b/databricks-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml @@ -0,0 +1,31 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "{{ cookiecutter.python_package }}" +version = "0.1" +dynamic = ["dependencies"] + +[tool.setuptools.packages.find] +exclude = ["tests"] + +[project.scripts] +"databricks_run = {{ cookiecutter.python_package }}.databricks_run: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] +dependencies = {file = "requirements.txt"} diff --git a/databricks-iris/{{ cookiecutter.repo_name }}/src/setup.py b/databricks-iris/{{ cookiecutter.repo_name }}/src/setup.py deleted file mode 100644 index ee21a4f4..00000000 --- a/databricks-iris/{{ cookiecutter.repo_name }}/src/setup.py +++ /dev/null @@ -1,39 +0,0 @@ -from setuptools import find_packages, setup - -entry_point = ( - "databricks_run = {{ cookiecutter.python_package }}.databricks_run: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("--"): - 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", - "myst-parser~=0.17.2", - "sphinx-autodoc-typehints==1.11.1", - "sphinx_copybutton==0.3.1", - "ipykernel>=5.3, <7.0", - "Jinja2<3.1.0", - ] - }, -) diff --git a/pandas-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml b/pandas-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml new file mode 100644 index 00000000..ea581e70 --- /dev/null +++ b/pandas-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml @@ -0,0 +1,31 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "{{ cookiecutter.python_package }}" +version = "0.1" +dynamic = ["dependencies"] + +[tool.setuptools.packages.find] +exclude = ["tests"] + +[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] +dependencies = {file = "requirements.txt"} diff --git a/pandas-iris/{{ cookiecutter.repo_name }}/src/setup.py b/pandas-iris/{{ cookiecutter.repo_name }}/src/setup.py deleted file mode 100644 index 392f4360..00000000 --- a/pandas-iris/{{ 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("--"): - 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", - "myst-parser~=0.17.2", - "sphinx-autodoc-typehints==1.11.1", - "sphinx_copybutton==0.3.1", - "ipykernel>=5.3, <7.0", - "Jinja2<3.1.0", - ] - }, -) diff --git a/pyspark-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml b/pyspark-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml new file mode 100644 index 00000000..ea581e70 --- /dev/null +++ b/pyspark-iris/{{ cookiecutter.repo_name }}/src/pyproject.toml @@ -0,0 +1,31 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "{{ cookiecutter.python_package }}" +version = "0.1" +dynamic = ["dependencies"] + +[tool.setuptools.packages.find] +exclude = ["tests"] + +[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] +dependencies = {file = "requirements.txt"} diff --git a/pyspark-iris/{{ cookiecutter.repo_name }}/src/setup.py b/pyspark-iris/{{ cookiecutter.repo_name }}/src/setup.py deleted file mode 100644 index 392f4360..00000000 --- a/pyspark-iris/{{ 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("--"): - 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", - "myst-parser~=0.17.2", - "sphinx-autodoc-typehints==1.11.1", - "sphinx_copybutton==0.3.1", - "ipykernel>=5.3, <7.0", - "Jinja2<3.1.0", - ] - }, -) diff --git a/pyspark/{{ cookiecutter.repo_name }}/src/pyproject.toml b/pyspark/{{ cookiecutter.repo_name }}/src/pyproject.toml new file mode 100644 index 00000000..ea581e70 --- /dev/null +++ b/pyspark/{{ cookiecutter.repo_name }}/src/pyproject.toml @@ -0,0 +1,31 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "{{ cookiecutter.python_package }}" +version = "0.1" +dynamic = ["dependencies"] + +[tool.setuptools.packages.find] +exclude = ["tests"] + +[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] +dependencies = {file = "requirements.txt"} diff --git a/pyspark/{{ cookiecutter.repo_name }}/src/setup.py b/pyspark/{{ cookiecutter.repo_name }}/src/setup.py deleted file mode 100644 index 392f4360..00000000 --- a/pyspark/{{ 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("--"): - 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", - "myst-parser~=0.17.2", - "sphinx-autodoc-typehints==1.11.1", - "sphinx_copybutton==0.3.1", - "ipykernel>=5.3, <7.0", - "Jinja2<3.1.0", - ] - }, -) diff --git a/spaceflights/{{ cookiecutter.repo_name }}/src/pyproject.toml b/spaceflights/{{ cookiecutter.repo_name }}/src/pyproject.toml index 402d9589..ea581e70 100644 --- a/spaceflights/{{ cookiecutter.repo_name }}/src/pyproject.toml +++ b/spaceflights/{{ cookiecutter.repo_name }}/src/pyproject.toml @@ -28,4 +28,4 @@ docs = [ ] [tool.setuptools.dynamic] -dependencies = {file = "requirements.txt"} \ No newline at end of file +dependencies = {file = "requirements.txt"} From 4476462937ed6b11a618a1da0b70300227636a3c Mon Sep 17 00:00:00 2001 From: Dmitry Sorokin Date: Thu, 24 Aug 2023 15:35:37 +0100 Subject: [PATCH 4/4] Bump the PyYAML dependency Signed-off-by: Dmitry Sorokin --- test_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_requirements.txt b/test_requirements.txt index fe97005a..ba0d150c 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -2,5 +2,5 @@ bandit>=1.6.2, <2.0 behave>=1.2.6, <2.0 black~=22.0 isort~=5.0 -PyYAML>=4.2, <6.0 +PyYAML>=4.2, <7.0 git+https://github.com/kedro-org/kedro.git@main#egg=kedro