Skip to content

Commit

Permalink
Adjust dependencies to allow installation on Salt OneDir (#318)
Browse files Browse the repository at this point in the history
* Update setup.cfg

* Fix jinja2 client so as to potentially not break non-OneDir installations

* Bump salt requirement to 3005 to see if that fixes tests

* Bump minimum salt version for tests

* Bump salt version for github tests to 3005.1

* Bump macos tests to Python 3.9
  • Loading branch information
ggiesen authored Nov 15, 2022
1 parent 0eefcce commit a7951e7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
- 3.8
- 3.9
salt-version:
- 3004.1
- 3005.1

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
python-version:
- 3.7
salt-version:
- 3004.1
- 3005.1

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -307,9 +307,9 @@ jobs:
max-parallel: 3
matrix:
python-version:
- 3.7
- 3.9
salt-version:
- 3004.1
- 3005.1

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
EXTRA_REQUIREMENTS_INSTALL = os.environ.get("EXTRA_REQUIREMENTS_INSTALL")

COVERAGE_VERSION_REQUIREMENT = "coverage==5.2"
SALT_REQUIREMENT = os.environ.get("SALT_REQUIREMENT") or "salt>=3003rc1"
SALT_REQUIREMENT = os.environ.get("SALT_REQUIREMENT") or "salt>=3005"
if SALT_REQUIREMENT == "salt==master":
SALT_REQUIREMENT = "git+https://github.com/saltstack/salt.git@master"

Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ setup_requires =
setuptools>=50.3.2
setuptools-declarative-requirements
install_requires =
salt>=3002
pyvmomi==7.0.2
salt>=3005
pyvmomi==7.0.3
importlib_metadata; python_version < "3.8"
jinja2<=3.0.1
jinja2<=3.1.0

[options.extras_require]
tests =
Expand Down

0 comments on commit a7951e7

Please sign in to comment.