From 1e70061cbc968cc3cd09ddb6cf42d16a49921335 Mon Sep 17 00:00:00 2001 From: beckermr Date: Sun, 2 Feb 2025 22:59:48 -0600 Subject: [PATCH 1/5] fix: ensure pypi readme works ok --- README.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index f0bd61dd7..08c9c4869 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,6 @@ -.. image:: UltraPlotLogo.svg - :width: 100% +.. image:: https://raw.githubusercontent.com/Ultraplot/ultraplot/refs/heads/main/UltraPlotLogo.svg + :alt: UltraPlot Logo + :width: 100% |build-status| |docs| |pypi| |code-style| |pre-commit| |pr-welcome| |license| @@ -10,7 +11,7 @@ publication-quality graphics. It builds upon ProPlot_ and transports it into the Why UltraPlot? | Write Less, Create More ========================================= -.. image:: logo/whyUltraPlot.svg +.. image:: https://raw.githubusercontent.com/Ultraplot/ultraplot/refs/heads/main/logo/whyUltraPlot.svg :width: 100% :alt: Comparison of ProPlot and UltraPlot :align: center From ac25c1a143c6f48f9f9f3594df91493852316534 Mon Sep 17 00:00:00 2001 From: beckermr Date: Sun, 2 Feb 2025 23:01:30 -0600 Subject: [PATCH 2/5] test: publish to test pypi once to ensure it is working --- .github/workflows/publish-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index fc9b7b00f..fefc8dbe1 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -60,7 +60,7 @@ jobs: shell: bash - name: Publish to TestPyPI - if: github.event_name != 'pull_request' + # if: github.event_name != 'pull_request' uses: pypa/gh-action-pypi-publish@release/v1 with: repository-url: https://test.pypi.org/legacy/ From 4927df506c05dd3ce025567c368fabfd99c15a9f Mon Sep 17 00:00:00 2001 From: beckermr Date: Sun, 2 Feb 2025 23:06:11 -0600 Subject: [PATCH 3/5] test: turn off local versions --- .github/workflows/publish-pypi.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index fefc8dbe1..25b4e116c 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -33,6 +33,11 @@ jobs: with: python-version: "3.12" + - name: remove local version + if: github.event_name == 'pull_request' + run: | + echo "local_scheme = no-local-version" >> pyproject.toml + - name: Build package run: | python -m pip install --upgrade pip wheel setuptools setuptools_scm build twine From a11abd336ae653bf5842d6dab5335fa93e2068f4 Mon Sep 17 00:00:00 2001 From: beckermr Date: Sun, 2 Feb 2025 23:08:01 -0600 Subject: [PATCH 4/5] test: hack it in once --- .github/workflows/publish-pypi.yml | 5 ----- pyproject.toml | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index 25b4e116c..fefc8dbe1 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -33,11 +33,6 @@ jobs: with: python-version: "3.12" - - name: remove local version - if: github.event_name == 'pull_request' - run: | - echo "local_scheme = no-local-version" >> pyproject.toml - - name: Build package run: | python -m pip install --upgrade pip wheel setuptools setuptools_scm build twine diff --git a/pyproject.toml b/pyproject.toml index 2a95b5ab7..4bfe5a3fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,3 +48,4 @@ include-package-data = true [tool.setuptools_scm] write_to = "ultraplot/_version.py" write_to_template = "__version__ = '{version}'\n" +local_scheme = "no-local-version" From 5f6b109572340cd707e7afac16ea2684c18f5082 Mon Sep 17 00:00:00 2001 From: beckermr Date: Sun, 2 Feb 2025 23:10:05 -0600 Subject: [PATCH 5/5] fix: remove hacks for testing --- .github/workflows/publish-pypi.yml | 2 +- pyproject.toml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index fefc8dbe1..fc9b7b00f 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -60,7 +60,7 @@ jobs: shell: bash - name: Publish to TestPyPI - # if: github.event_name != 'pull_request' + if: github.event_name != 'pull_request' uses: pypa/gh-action-pypi-publish@release/v1 with: repository-url: https://test.pypi.org/legacy/ diff --git a/pyproject.toml b/pyproject.toml index 4bfe5a3fa..2a95b5ab7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,4 +48,3 @@ include-package-data = true [tool.setuptools_scm] write_to = "ultraplot/_version.py" write_to_template = "__version__ = '{version}'\n" -local_scheme = "no-local-version"