Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .github/workflows/build-publish.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish to PyPI
name: Publish to TestPyPI

on:
release:
Expand All @@ -7,7 +7,7 @@ on:

permissions:
contents: read
id-token: write # required for PyPI Trusted Publishing (OIDC)
id-token: write # required for Trusted Publishing (OIDC)

jobs:
build:
Expand All @@ -26,10 +26,13 @@ jobs:
- name: Install build tooling
run: |
python -m pip install --upgrade pip
python -m pip install build twine
python -m pip install build twine wheel

- name: Clean build artifacts
run: rm -rf dist build *.egg-info **/*.egg-info

- name: Build sdist and wheel
run: python -m build
run: python -m build --wheel

- name: Twine check
run: python -m twine check dist/*
Expand All @@ -43,16 +46,17 @@ jobs:
publish:
needs: build
runs-on: ubuntu-latest
environment: pypi
environment: test-merlin
steps:
- name: Download dist artifacts
uses: actions/download-artifact@v4
with:
name: dist
path: dist/

- name: Publish to PyPI (Trusted Publishing)
- name: Publish to TestPyPI (Trusted Publishing)
uses: pypa/gh-action-pypi-publish@release/v1
with:
skip-existing: true
packages-dir: dist/
repository-url: https://test.pypi.org/legacy/
20 changes: 6 additions & 14 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
requires = [
"setuptools>=45",
"wheel",
"scmver",
"setuptools-scm>=8"
]
build-backend = "setuptools.build_meta"
Expand Down Expand Up @@ -73,18 +72,11 @@ source = "https://github.com/merlinquantum/merlin"
issues = "https://github.com/merlinquantum/merlin/issues"

[tool.setuptools]
package-dir = {"" = "src"}
packages = [
"merlin",
"merlin.algorithms",
"merlin.bridge",
"merlin.builder",
"merlin.core",
"merlin.datasets",
"merlin.measurement",
"merlin.pcvl_pytorch",
"merlin.utils",
]

[tool.setuptools.packages.find]
where = ["."]
include = ["merlin*"]
namespaces = false

[tool.pytest.ini_options]
testpaths = ["tests", "benchmarks"]
Expand Down Expand Up @@ -182,4 +174,4 @@ ignore = [
quote-style = "double"
indent-style = "space"
skip-magic-trailing-comma = false
line-ending = "auto"
line-ending = "auto"
40 changes: 0 additions & 40 deletions setup.py

This file was deleted.

Loading