diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 114b5fc..b2c18a9 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,2 +1,3 @@ -# see https://github.com/ansible-community/devtools -_extends: ansible-community/devtools +--- +# see https://github.com/ansible/team-devtools +_extends: ansible/team-devtools diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8abee0..a61a56b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,8 @@ jobs: - uses: Actions-R-Us/actions-tagger@latest with: token: "${{ github.token }}" - publish_latest_tag: true + # Do not activate latest tag because it seems to affect RTD builds + # publish_latest_tag: true pypi: name: Publish to PyPI registry environment: release diff --git a/pyproject.toml b/pyproject.toml index d535517..35e28ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] build-backend = "setuptools.build_meta" requires = [ - "setuptools >= 63.0.0", # required by pyproject+setuptools_scm integration + "setuptools >= 65.3.0", # required by pyproject+setuptools_scm integration and editable installs "setuptools_scm[toml] >= 7.0.5" # required for "no-local-version" scheme ] @@ -281,9 +281,19 @@ optional-dependencies.docs = {file = [".config/requirements-docs.in"]} optional-dependencies.test = {file = [".config/requirements-test.in"]} [tool.setuptools_scm] +# To prevent accidental pick of mobile version tags such 'v6' +git_describe_command = [ + "git", + "describe", + "--dirty", + "--long", + "--match", + "--tags", + "v*.*" +] local_scheme = "no-local-version" +tag_regex = '^(?Pv)?(?P[^\+]+)(?P.*)?$' write_to = "src/ansible_dev_environment/_version.py" [tool.tomlsort] -all = true in_place = true