Skip to content

Commit

Permalink
Convert back to setuptools-scm
Browse files Browse the repository at this point in the history
  • Loading branch information
john-westcott-iv committed Jan 31, 2024
1 parent 9973419 commit 44f8700
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 27 deletions.
23 changes: 13 additions & 10 deletions ansible_base/__init__.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
try:
from ._version import version
except ImportError:
version = 'Unknown'
from ._version import __version__, __version_tuple__ # noqa: F401
except Exception:
import datetime
import subprocess
from typing import Tuple, Union

from typing import Tuple, Union
calver_now = datetime.datetime.now().strftime("%Y.%m.%d")
shaw = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('ascii').strip()

VERSION_TUPLE = Tuple[Union[int, str], ...]
VERSION_TUPLE = Tuple[Union[int, str], ...]

__version__: str
__version_tuple__: VERSION_TUPLE
version_tuple: VERSION_TUPLE
__version__: str
__version_tuple__: VERSION_TUPLE
version_tuple: VERSION_TUPLE

__version__ = version
__version_tuple__ = version_tuple = tuple(version.split('.'))
__version__ = f'{calver_now}-{shaw}'
__version_tuple__ = version_tuple = tuple(__version__.split('.'))
6 changes: 0 additions & 6 deletions ansible_base/_version.py

This file was deleted.

8 changes: 3 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ classifiers = [
]
dynamic = ["version", "dependencies", "optional-dependencies"]

[tool.setuptools]
include-package-data = false

[tool.setuptools.packages.find]
include = ["ansible_base*"]

Expand All @@ -51,14 +48,15 @@ optional-dependencies.rest_filters = { file = [ "requirements/requirements_rest_
optional-dependencies.channel_auth = { file = [ "requirements/requirements_channels.in" ] }
optional-dependencies.jwt_consumer = { file = [ "requirements/requirements_jwt_consumer.in" ] }
optional-dependencies.testing = { file = [ "requirements/requirements_testing.in" ] }
version = {attr = "ansible_base.__version__"}

[build-system]
requires = ["setuptools>=64"]
requires = ["setuptools>=64", "setuptools_scm>=8"]
build-backend = 'setuptools.build_meta'

[tool.setuptools_scm]
version_scheme = "calver-by-date"
version_file = 'ansible_base/_version.py'
local_scheme = 'no-local-version'

[tool.black]
line-length = 160
Expand Down
9 changes: 3 additions & 6 deletions tools/ansible/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@
set_fact:
release_number: "{{ ansible_date_time.year }}.{{ ansible_date_time.month }}.{{ ansible_date_time.day }}"

- name: "Update version file with {{ release_number }}"
ansible.builtin.lineinfile:
create: True
line: "version = '{{ release_number }}'"
path: "../../ansible_base/_version.py"
regex: "^version = .*"
- name: Tag the repo
command:
command: "git tag {{ release_number }}"

- name: Build django-ansible-base
command:
Expand Down

0 comments on commit 44f8700

Please sign in to comment.