From ec2af5b2da7d09fcac6c4ec05adf5707edf8e87a Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Thu, 25 Jan 2024 15:12:32 +0500 Subject: [PATCH 1/5] fix: fix pypi publish workflow build --- .github/workflows/pypi-publish.yml | 3 ++- setup.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 3aab45a..611eebe 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -1,6 +1,7 @@ name: Publish package to PyPI on: + pull_request: push: tags: - '*' @@ -24,7 +25,7 @@ jobs: run: python setup.py sdist bdist_wheel - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ password: ${{ secrets.PYPI_UPLOAD_TOKEN }} diff --git a/setup.py b/setup.py index f2c06b8..fa56460 100644 --- a/setup.py +++ b/setup.py @@ -82,8 +82,10 @@ def is_requirement(line): setup( name='concept-xblock', - version='0.3.0', + version='0.3.1', description='concept XBlock', # TODO: write a better description. + long_description='This is a simple XBlock which will allows one to tag problems with concepts.' + long_description_content_type='text/x-rst' packages=[ 'concept', ], From 660f24d5166efd4f6b2434f0e156ab9037fe2db4 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Thu, 25 Jan 2024 15:18:29 +0500 Subject: [PATCH 2/5] fix: fix setup.py file syntax --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index fa56460..ae802e4 100644 --- a/setup.py +++ b/setup.py @@ -84,8 +84,8 @@ def is_requirement(line): name='concept-xblock', version='0.3.1', description='concept XBlock', # TODO: write a better description. - long_description='This is a simple XBlock which will allows one to tag problems with concepts.' - long_description_content_type='text/x-rst' + long_description='This is a simple XBlock which will allows one to tag problems with concepts.', + long_description_content_type='text/x-rst', packages=[ 'concept', ], From 67c0c4878d438f13f3c9d35bef7d52ad808fb2f0 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Thu, 25 Jan 2024 15:27:15 +0500 Subject: [PATCH 3/5] fix: update pypi check to run on push --- .github/workflows/pypi-publish.yml | 1 - setup.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 611eebe..a8e10c3 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -1,7 +1,6 @@ name: Publish package to PyPI on: - pull_request: push: tags: - '*' diff --git a/setup.py b/setup.py index ae802e4..ae280d9 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,7 @@ def is_requirement(line): setup( name='concept-xblock', - version='0.3.1', + version='0.3.2', description='concept XBlock', # TODO: write a better description. long_description='This is a simple XBlock which will allows one to tag problems with concepts.', long_description_content_type='text/x-rst', From 83f5baf4bf323d2bdce3d894f8860c3873708294 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Thu, 25 Jan 2024 17:05:10 +0500 Subject: [PATCH 4/5] docs: update setup.py content --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ae280d9..0c3b72f 100644 --- a/setup.py +++ b/setup.py @@ -84,7 +84,7 @@ def is_requirement(line): name='concept-xblock', version='0.3.2', description='concept XBlock', # TODO: write a better description. - long_description='This is a simple XBlock which will allows one to tag problems with concepts.', + long_description=open('README.md', encoding='utf-8').read(), # pylint: disable=consider-using-with long_description_content_type='text/x-rst', packages=[ 'concept', From ca8a3b55168411d7eba612214cc7c592b8e6d017 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Thu, 25 Jan 2024 17:22:46 +0500 Subject: [PATCH 5/5] docs: update setup.py Co-authored-by: Muhammad Soban Javed <58461728+iamsobanjaved@users.noreply.github.com> --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0c3b72f..eb5c0f9 100644 --- a/setup.py +++ b/setup.py @@ -85,7 +85,7 @@ def is_requirement(line): version='0.3.2', description='concept XBlock', # TODO: write a better description. long_description=open('README.md', encoding='utf-8').read(), # pylint: disable=consider-using-with - long_description_content_type='text/x-rst', + long_description_content_type='text/markdown', packages=[ 'concept', ],