From 4e73699be9016d3817702cdd0adc9d51379905be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Bj=C3=B6rklund?= Date: Thu, 17 Aug 2023 15:11:38 +0300 Subject: [PATCH] rename filetypes plugin dir --- .github/workflows/publish.yaml | 4 ++-- .gitignore | 1 + .../README.md | 0 .../pyproject.toml | 0 .../xiplot_filetypes/__init__.py | 0 plugins/.gitignore | 1 - pyproject.toml | 7 ++----- requirements.txt | 1 + 8 files changed, 6 insertions(+), 8 deletions(-) rename {xiplot_plugin_filetypes => plugin_xiplot_filetypes}/README.md (100%) rename {xiplot_plugin_filetypes => plugin_xiplot_filetypes}/pyproject.toml (100%) rename {xiplot_plugin_filetypes => plugin_xiplot_filetypes}/xiplot_filetypes/__init__.py (100%) delete mode 100644 plugins/.gitignore diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 282c2785..6dc989de 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -43,9 +43,9 @@ jobs: python -m pip install --upgrade pip python -m pip install build - name: Build plugin - run: python -m build xiplot_plugin_filetypes + run: python -m build plugin_xiplot_filetypes - name: Publish plugin uses: pypa/gh-action-pypi-publish@release/v1 with: - packages-dir: xiplot_plugin_filetypes/dist + packages-dir: plugin_xiplot_filetypes/dist skip-existing: true diff --git a/.gitignore b/.gitignore index 85b000bf..baaa65a1 100644 --- a/.gitignore +++ b/.gitignore @@ -135,3 +135,4 @@ Untitled.ipynb data/ uploads/ node_modules +plugins/*.whl diff --git a/xiplot_plugin_filetypes/README.md b/plugin_xiplot_filetypes/README.md similarity index 100% rename from xiplot_plugin_filetypes/README.md rename to plugin_xiplot_filetypes/README.md diff --git a/xiplot_plugin_filetypes/pyproject.toml b/plugin_xiplot_filetypes/pyproject.toml similarity index 100% rename from xiplot_plugin_filetypes/pyproject.toml rename to plugin_xiplot_filetypes/pyproject.toml diff --git a/xiplot_plugin_filetypes/xiplot_filetypes/__init__.py b/plugin_xiplot_filetypes/xiplot_filetypes/__init__.py similarity index 100% rename from xiplot_plugin_filetypes/xiplot_filetypes/__init__.py rename to plugin_xiplot_filetypes/xiplot_filetypes/__init__.py diff --git a/plugins/.gitignore b/plugins/.gitignore deleted file mode 100644 index be84370a..00000000 --- a/plugins/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.whl diff --git a/pyproject.toml b/pyproject.toml index a501f772..6696d5b9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,11 +55,8 @@ xiplot = "xiplot:cli" requires = ["setuptools>=42", "wheel"] build-backend = "setuptools.build_meta" -[tool.setuptools.packages.find] -where = ["."] -include = ["xiplot*"] -exclude = ["tests", "test_plugin"] -namespaces = true +[tool.setuptools] +packages = ["xiplot"] [tool.black] target-version = ['py37'] diff --git a/requirements.txt b/requirements.txt index e282525e..8a382833 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,3 +8,4 @@ plotly>=5.9.0 scikit-learn>=1.0 kaleido~=0.2.1 packaging<22 # Needed for dash-uploader==0.6.0 +./plugin_xiplot_filetypes