Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Project config fixes #70

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Project config fixes #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 requirements.txt → .config/requirements.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/tox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
python-version: ${{ matrix.python_version }}

- name: Install tox
run: python3 -m pip install --upgrade "tox>=4.0.2"
run: python3 -m pip install --upgrade "tox>=4.11.3"

- name: Log Python info (${{ matrix.python_version }})
run: |
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,5 @@ cython_debug/

# Version created and populated by setuptools_scm
/src/ansible_development_environment/_version.py

.DS_Store
7 changes: 4 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[build-system]
build-backend = "setuptools.build_meta"
requires = ["setuptools >= 45", "setuptools_scm[toml]>=6.2"]
requires = [
"setuptools >= 63.0.0", # required by pyproject+setuptools_scm integration
"setuptools_scm[toml] >= 7.0.5" # required for "no-local-version" scheme
]

[project]
authors = [{"email" = "bthornto@redhat.com", "name" = "Bradley A. Thornton"}]
Expand Down Expand Up @@ -254,8 +257,6 @@ convention = "pep257"
[tool.setuptools.dynamic]
dependencies = {file = [".config/requirements.in"]}
optional-dependencies.dev = {file = [".config/requirements-dev.txt"]}
optional-dependencies.docs = {file = [".config/requirements-docs.txt"]}
optional-dependencies.lock = {file = [".config/requirements-lock.txt"]}
optional-dependencies.test = {file = [".config/requirements-test.txt"]}

[tool.setuptools_scm]
Expand Down
2 changes: 1 addition & 1 deletion src/ansible_development_environment/arg_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


try:
from ._version import version as __version__ # type: ignore[import-not-found]
from ._version import version as __version__ # type: ignore[unused-ignore,import-not-found]
except ImportError: # pragma: no cover
try:
import pkg_resources
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
requires =
tox>=4.2
tox>=4.11.3
env_list =
py
lint
Expand All @@ -27,7 +27,7 @@ set_env =
COVERAGE_FILE = {env:COVERAGE_FILE:{toxworkdir}/.coverage.{envname}}
COVERAGE_PROCESS_START = {toxinidir}/pyproject.toml
FORCE_COLOR = 1
PIP_CONSTRAINT = {toxinidir}/requirements.txt
PIP_CONSTRAINT = {toxinidir}/.config/requirements.txt
PRE_COMMIT_COLOR = always
TERM = xterm-256color
commands =
Expand Down