External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-21 05:00:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

Updated setup.py --version to python3 -m setuptools_scm.

Browse Source
This commit is contained in:
Lila
2022-06-24 10:22:56 -04:00
parent 35a5f93182
commit 63ea6bb5b3
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -5,8 +5,8 @@ NPM_BIN ?= npm
CHROMIUM_BIN=/tmp/chrome-linux/chrome CHROMIUM_BIN=/tmp/chrome-linux/chrome
GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
MANAGEMENT_COMMAND ?= awx-manage MANAGEMENT_COMMAND ?= awx-manage
VERSION := $(shell $(PYTHON) setup.py --version) VERSION := $(shell $(PYTHON) -m setuptools_scm)
COLLECTION_VERSION := $(shell $(PYTHON) setup.py --version | cut -d . -f 1-3) COLLECTION_VERSION := $(shell $(PYTHON) -m setuptools_scm | cut -d . -f 1-3)
# NOTE: This defaults the container image version to the branch that's active # NOTE: This defaults the container image version to the branch that's active
COMPOSE_TAG ?= $(GIT_BRANCH) COMPOSE_TAG ?= $(GIT_BRANCH)

6
pyproject.toml
View File

@@ -3,3 +3,9 @@ line-length = 160
fast = true fast = true
skip-string-normalization = true skip-string-normalization = true
exclude = "awx_collection" exclude = "awx_collection"
[build-system]
requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
[tool.setuptools_scm]