diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 04725607a..0739256e2 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -16,11 +16,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Install Poetry - run: | - # TODO(eng/recordflux/RecordFlux#1531): Remove installation of Poetry (and remove caching) - pipx install poetry==${{ env.POETRY_VERSION }} - pipx inject poetry poetry-dynamic-versioning==${{ env.POETRY_DYNAMIC_VERSIONING_VERSION }} - name: Set up Python uses: actions/setup-python@v5 with: @@ -29,7 +24,6 @@ jobs: 3.9 3.10 3.11 - cache: poetry - name: Install Alire uses: alire-project/setup-alire@v2 with: @@ -42,8 +36,7 @@ jobs: run: | eval `make printenv_gnat` gnat --version - # TODO(eng/recordflux/RecordFlux#1531): Remove explicit initialization - make init pypi_dist + make pypi_dist - name: Store distribution packages uses: actions/upload-artifact@v4 with: diff --git a/Makefile b/Makefile index d265d695f..3b11ad969 100644 --- a/Makefile +++ b/Makefile @@ -430,7 +430,7 @@ dist: $(SDIST) $(SDIST): $(BUILD_DEPS) $(PARSER) $(VSIX) pyproject.toml $(wildcard bin/*) $(wildcard rflx/*) $(POETRY) build -vv --no-cache -pypi_dist: +pypi_dist: $(PROJECT_MANAGEMENT) # Build distributions without local version identifier $(foreach version,$(PYTHON_VERSIONS),poetry env use $(version) && $(MAKE) dist POETRY_DYNAMIC_VERSIONING_BYPASS=$$(poetry version -s | sed 's/+.*//') || exit;)