From 4c370e0762c627ad1d7f745b90e41c672a6157d2 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 30 Oct 2022 16:11:55 +0200 Subject: [PATCH 1/4] Fetch all tags to name wheel after version not 'main' --- .github/workflows/workflow.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index c3a48a0..541a919 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -31,6 +31,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Set up Python uses: actions/setup-python@v4 with: @@ -65,7 +67,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11-dev', 'pypy3.8'] + python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', 'pypy3.8'] sphinx-version: ['>=4,<5', '>=5,<6', '>=6a0,<7'] os: [windows-latest, macos-latest, ubuntu-latest] exclude: From ba53873a35c76d313d52dd8e7125dec3d4f9e3c5 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 30 Oct 2022 17:03:39 +0200 Subject: [PATCH 2/4] Add colour to CI logging --- .github/workflows/workflow.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 541a919..b1f909c 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -7,6 +7,10 @@ on: create: tags: - '*' + +env: + FORCE_COLOR: 1 + jobs: check: runs-on: ubuntu-latest From 0ed62873aac832b4815d452d91603ad13e5fdaf0 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 30 Oct 2022 17:04:18 +0200 Subject: [PATCH 3/4] Use setuptools_scm to fetch version from Git --- .github/workflows/workflow.yml | 2 +- setup.py | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index b1f909c..7c00faf 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -101,7 +101,7 @@ jobs: path: dist - name: Install downloaded wheel run: | - python -m pip install dist/sphinxext_opengraph-main-py3-none-any.whl + python -m pip install --find-links=dist sphinxext-opengraph - name: Run tests for ${{ matrix.python-version }} run: | python -m pytest -vv diff --git a/setup.py b/setup.py index c7f3635..fd969e9 100644 --- a/setup.py +++ b/setup.py @@ -1,26 +1,12 @@ -import subprocess - import setuptools -# This will fail if something happens or if not in a git repository. -# This is intentional. -try: - ret = subprocess.run( - "git describe --tags --abbrev=0", - capture_output=True, - check=True, - shell=True, - ) - version = ret.stdout.decode("utf-8").strip() -except: - version = "main" - with open("README.md", encoding="utf-8") as readme: long_description = readme.read() setuptools.setup( name="sphinxext-opengraph", - version=version, + use_scm_version=True, + setup_requires=["setuptools_scm"], author="Itay Ziv", author_email="itay220204@gmail.com", description="Sphinx Extension to enable OGP support", From 9c1aef3c5d774fb963d84d4b347df62c3a5a25dc Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 30 Oct 2022 17:33:16 +0200 Subject: [PATCH 4/4] Only install the local wheel --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 7c00faf..b033385 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -101,7 +101,7 @@ jobs: path: dist - name: Install downloaded wheel run: | - python -m pip install --find-links=dist sphinxext-opengraph + python -m pip install --no-index --find-links=dist sphinxext-opengraph - name: Run tests for ${{ matrix.python-version }} run: | python -m pytest -vv