Skip to content

Commit

Permalink
WIP: Test version fix
Browse files Browse the repository at this point in the history
  • Loading branch information
audgirka committed Jul 21, 2023
1 parent 9cabbc8 commit e2b2302
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 96 deletions.
4 changes: 4 additions & 0 deletions .git_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node: $Format:%H$
node-date: $Format:%cI$
describe-name: $Format:%(describe:tags=true)$
ref-names: $Format:%D$
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Force LF line endings for text files
* text=auto eol=lf

*.png binary

# Needed for setuptools-scm-git-archive
.git_archival.txt export-subst
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ __pycache__/
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
Expand Down Expand Up @@ -130,3 +131,6 @@ dmypy.json
.test-results
*.lcov
ansible_collections

# Generated by setuptools-scm
src/ansible_compat/_version.py
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
test/assets/

# Generated by setuptools-scm
src/ansible_compat/_version.py
4 changes: 0 additions & 4 deletions dist/.gitignore

This file was deleted.

88 changes: 0 additions & 88 deletions dist/python-ansible-compat.spec.in

This file was deleted.

5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
requires = [
"setuptools >= 61.0", # PEP-621
"setuptools_scm[toml] >= 7.0.0",
"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
]
build-backend = "setuptools.build_meta"

Expand Down Expand Up @@ -155,3 +155,4 @@ known-third-party = ["packaging"]

[tool.setuptools_scm]
local_scheme = "no-local-version"
write_to = "src/ansible_compat/_version.py"
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --extra=docs --extra=test --output-file=requirements.txt --resolver=backtracking --strip-extras --unsafe-package=ansible-core --unsafe-package=resolvelib --unsafe-package=typing_extensions pyproject.toml
# pip-compile --extra=docs --extra=test --output-file=requirements.txt --strip-extras --unsafe-package=ansible-core --unsafe-package=resolvelib --unsafe-package=typing_extensions pyproject.toml
#
argparse-manpage==4.2
# via ansible-compat (pyproject.toml)
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ envlist =
py{39,310,311}{,-devel,-ansible212,-ansible213,-ansible214,-ansible215}
isolated_build = true
skip_missing_interpreters = True
requires =
tox >= 4.6.3
setuptools >= 65.3.0 # editable installs

[testenv]
description =
Expand All @@ -24,7 +27,7 @@ deps =
ansible214: ansible-core>=2.14,<2.15
ansible215: ansible-core>=2.15,<2.16

devel: ansible-core @ git+https://github.com/ansible/ansible.git # GPLv3+
devel: ansible-core @ git+https://github.com/ansible/ansible.git@c5d18c39d81e2b3b10856b2fb76747230e4fac4a # GPLv3+
# avoid installing ansible-core on -devel envs:
!devel: ansible-core
extras =
Expand Down

0 comments on commit e2b2302

Please sign in to comment.