From bef2c69e7b1fe442836c1c959dd7f2e6317b4584 Mon Sep 17 00:00:00 2001 From: Guy Pilosof Date: Sun, 3 Jul 2022 08:39:24 +0300 Subject: [PATCH 1/2] fix packaging and add pyproject.toml fie --- pyproject.toml | 3 +++ setup.cfg | 8 ++------ setup.py | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..fed528d4a --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" diff --git a/setup.cfg b/setup.cfg index 9508d9b5f..789f74e8f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,14 +15,10 @@ classifiers = Operating System :: OS Independent [options] -package_dir = - = src -packages = find: +packages = + descope python_requires = >=3.6 -[options.packages.find] -where = src - install_requires = requests PyJWT diff --git a/setup.py b/setup.py index 29935f5b8..793d8d95a 100644 --- a/setup.py +++ b/setup.py @@ -20,8 +20,7 @@ "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", ], - package_dir={"": "src"}, - packages=setuptools.find_packages(where="src"), + packages=["descope"], python_requires=">=3.6", install_requires=["requests", "PyJWT", "cryptography", "email-validator"], ) From b850c2e81a9816bf1c80612bcb11ff2f1326ac4a Mon Sep 17 00:00:00 2001 From: Guy Pilosof Date: Sun, 3 Jul 2022 10:35:05 +0300 Subject: [PATCH 2/2] disable the git action - Create the Badge --- .github/workflows/ci_pr.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci_pr.yaml b/.github/workflows/ci_pr.yaml index 114183c57..bd9a24dfb 100644 --- a/.github/workflows/ci_pr.yaml +++ b/.github/workflows/ci_pr.yaml @@ -46,13 +46,13 @@ jobs: echo "Coverage Time - ${{ steps.coverageComment.outputs.time }}" echo "Not Success Test Info - ${{ steps.coverageComment.outputs.notSuccessTestInfo }}" - - name: Create the Badge - uses: schneegans/dynamic-badges-action@v1.4.0 - with: - auth: ${{ secrets.CI_READ_COMMON }} - gistID: 277ec23e4e70728824362a0d24fbd0f9 - filename: pytest-coverage-comment.json - label: Coverage Report - message: ${{ steps.coverageComment.outputs.coverage }} - color: ${{ steps.coverageComment.outputs.color }} - namedLogo: pytest + #- name: Create the Badge + # uses: schneegans/dynamic-badges-action@v1.4.0 + # with: + # auth: ${{ secrets.CI_READ_COMMON }} + # gistID: 277ec23e4e70728824362a0d24fbd0f9 + # filename: pytest-coverage-comment.json + # label: Coverage Report + # message: ${{ steps.coverageComment.outputs.coverage }} + # color: ${{ steps.coverageComment.outputs.color }} + # namedLogo: pytest