From 0f02b534a8251d7da138030d004cd7da9e4c67f8 Mon Sep 17 00:00:00 2001 From: MirceaDan Date: Mon, 3 Jun 2024 15:16:45 -0700 Subject: [PATCH 1/9] Update python-publish.yml --- .github/workflows/python-publish.yml | 30 ++++++++++------------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index bdaab28..2816f52 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -12,28 +12,20 @@ on: release: types: [published] -permissions: - contents: read - jobs: - deploy: - + pypi-publish: + name: Upload release to PyPI runs-on: ubuntu-latest - + environment: + name: pypi + url: https://pypi.org/p/dpugen + permissions: + id-token: write # IMPORTANT: this permission is mandatory for trusted publishing steps: - - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v3 - with: - python-version: '3.x' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install build - - name: Build package - run: python -m build - - name: Publish package - uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29 + # retrieve your distributions here + + - name: Publish package distributions to PyPI + uses: pypa/gh-action-pypi-publish@release/v1.8 with: user: __token__ password: ${{ secrets.PYPI_API_TOKEN }} From 512506fd9cecb87bf3758bbd9493f6a9bebc2987 Mon Sep 17 00:00:00 2001 From: MirceaDan Date: Mon, 3 Jun 2024 15:17:43 -0700 Subject: [PATCH 2/9] Update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 3a5a52a..3e7de08 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = dpugen -version = 0.1.3 +version = 0.2.1 author = Mircea Dan Gheorghe author_email = mircea-dan.gheorghe@keysight.com description = Multi-vendor DPU library to generate its configuration From 9a8967651fb1d0100a75686bc682daf537857858 Mon Sep 17 00:00:00 2001 From: MirceaDan Date: Mon, 3 Jun 2024 15:20:36 -0700 Subject: [PATCH 3/9] Update python-publish.yml --- .github/workflows/python-publish.yml | 30 ++++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 2816f52..bdaab28 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -12,20 +12,28 @@ on: release: types: [published] +permissions: + contents: read + jobs: - pypi-publish: - name: Upload release to PyPI + deploy: + runs-on: ubuntu-latest - environment: - name: pypi - url: https://pypi.org/p/dpugen - permissions: - id-token: write # IMPORTANT: this permission is mandatory for trusted publishing - steps: - # retrieve your distributions here - - name: Publish package distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1.8 + steps: + - uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v3 + with: + python-version: '3.x' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install build + - name: Build package + run: python -m build + - name: Publish package + uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29 with: user: __token__ password: ${{ secrets.PYPI_API_TOKEN }} From dea6038cff7edfabb3a67e14b94f3668a9855ba4 Mon Sep 17 00:00:00 2001 From: MirceaDan Date: Mon, 3 Jun 2024 15:24:57 -0700 Subject: [PATCH 4/9] orjson --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index 3e7de08..ff73ed2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,6 +22,7 @@ install_requires = ipaddress macaddress munch + orjson [options.packages.find] where = dpugen From 35e4ba91a5388321f41c6a3f4729162333e16588 Mon Sep 17 00:00:00 2001 From: MirceaDan Date: Mon, 3 Jun 2024 15:36:03 -0700 Subject: [PATCH 5/9] Update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index ff73ed2..9b3187e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,7 +15,7 @@ classifiers = [options] package_dir = - = dpugen + = . packages = find: python_requires = >=2.7, <4 install_requires = From f8b02cde659fb78cb6313e76bfdcde4965dbe780 Mon Sep 17 00:00:00 2001 From: MirceaDan Date: Mon, 3 Jun 2024 15:38:25 -0700 Subject: [PATCH 6/9] Update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 9b3187e..ff73ed2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,7 +15,7 @@ classifiers = [options] package_dir = - = . + = dpugen packages = find: python_requires = >=2.7, <4 install_requires = From 59cf0186c02d2c273da851d2607a669b52f5b2eb Mon Sep 17 00:00:00 2001 From: MirceaDan Date: Mon, 3 Jun 2024 15:39:41 -0700 Subject: [PATCH 7/9] Update python-publish.yml --- .github/workflows/python-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index bdaab28..19590f6 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -37,3 +37,4 @@ jobs: with: user: __token__ password: ${{ secrets.PYPI_API_TOKEN }} + verbose: true From be2df026ec3b533ae160fefeb4cb65a3d829c0ee Mon Sep 17 00:00:00 2001 From: Vinod Kumar <119973184+vikumarks@users.noreply.github.com> Date: Mon, 3 Jun 2024 17:48:34 -0700 Subject: [PATCH 8/9] Update setup.cfg --- setup.cfg | 5 ----- 1 file changed, 5 deletions(-) diff --git a/setup.cfg b/setup.cfg index ff73ed2..fde8ea1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,8 +14,6 @@ classifiers = Operating System :: OS Independent [options] -package_dir = - = dpugen packages = find: python_requires = >=2.7, <4 install_requires = @@ -24,9 +22,6 @@ install_requires = munch orjson -[options.packages.find] -where = dpugen - [egg_info] tag_build = tag_date = 0 From 2a45dd2a14e556d530ddd6caa85333483341af68 Mon Sep 17 00:00:00 2001 From: Vinod Kumar <119973184+vikumarks@users.noreply.github.com> Date: Mon, 3 Jun 2024 17:59:12 -0700 Subject: [PATCH 9/9] Update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index fde8ea1..01f1ad6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = dpugen -version = 0.2.1 +version = 0.2.2 author = Mircea Dan Gheorghe author_email = mircea-dan.gheorghe@keysight.com description = Multi-vendor DPU library to generate its configuration