Skip to content

Commit 1038ec3

Browse files
authored
fix(deps): Fix the dependencies pinning (#54)
1 parent 1d786a9 commit 1038ec3

File tree

6 files changed

+54
-38
lines changed

6 files changed

+54
-38
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
if: success() || failure()
133133
run: |
134134
pre-commit install
135-
makim tests.lint
135+
makim tests.linter
136136
137137
- name: Setup tmate session
138138
if: "${{ failure() && (contains(github.event.pull_request.labels.*.name, 'ci:enable-debugging')) }}"

.makim.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,32 @@ groups:
5757
5858
tests:
5959
targets:
60-
lint:
60+
linter:
6161
help: Run linter tools
6262
run: pre-commit run --all-files --verbose
6363

6464
unittest:
6565
help: Run tests
6666
run: pytest -s -vv tests
6767

68+
smoke:
69+
help: Run smoke tests
70+
dependencies:
71+
- target: smoke-tests.simple
72+
- target: smoke-tests.complex
73+
- target: smoke-tests.containers
74+
- target: smoke-tests.unittest
75+
- target: smoke-tests.vars-env
76+
- target: smoke-tests.bash
77+
78+
ci:
79+
help: Run all targets used on CI
80+
dependencies:
81+
- target: tests.linter
82+
- target: tests.unittest
83+
- target: tests.smoke
84+
- target: docs.build
85+
6886
smoke-tests:
6987
targets:
7088
simple:

conda/dev.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@ channels:
44
- conda-forge
55
dependencies:
66
- python 3.8.1 # min version supported
7-
- poetry >=1.3
7+
- poetry >=1.5
88
- nodejs # used by semantic-release
9-
# https://github.com/ionrock/cachecontrol/issues/292#issuecomment-1536120527
10-
- urllib3 <2

docs/contributing.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ $ git checkout -b name-of-your-bugfix-or-feature
8686
6. When you’re done makimg changes, check that your changes pass flake8
8787
and the tests, including testing other Python versions with tox::
8888
```bash
89-
$ makim lint
90-
$ makim test
89+
$ makim tests.linter
90+
$ makim tests.unittest
91+
$ makim tests.smoke
9192
```
9293
7. Commit your changes and push your branch to GitHub::
9394
```bash

pyproject.toml

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -41,37 +41,36 @@ exclude = [
4141

4242
[tool.poetry.dependencies]
4343
python = "^3.8.1"
44-
sh = "^2.0.0"
44+
sh = ">=2.0.0"
4545
pyyaml = ">=5.0"
46-
jinja2 = "<3.0.3"
47-
xonsh = "^0.14.0"
48-
python-dotenv = "^0.21.1"
49-
colorama = "^0.4.6"
50-
urllib3 = "<2"
46+
jinja2 = ">=2.0"
47+
xonsh = ">=0.14.0"
48+
python-dotenv = ">=0.21.1"
49+
colorama = ">=0.4.6"
5150

5251
[tool.poetry.group.dev.dependencies]
53-
containers-sugar = "1.7.0"
54-
pytest = "^7"
55-
blue = "^0.9.1"
56-
isort = "^5"
57-
pre-commit = "^3"
58-
mypy = "^1"
59-
pytest-cov = "^3.0.0"
60-
mkdocs = ">=1.2.3,<2"
61-
mkdocs-exclude = ">=1.0.2,<2"
62-
mkdocs-jupyter = ">=0.20.0,<1"
63-
mkdocs-literate-nav = ">=0.4.1,<1"
64-
mkdocs-macros-plugin = ">=0.6.3,<1"
65-
mkdocs-material = ">=8.2.1,<9"
66-
mkdocstrings = ">=0.17.0,<0.18.0"
67-
ruff = "^0.0.272"
68-
bandit = "^1.7.5"
69-
vulture = "^2.7"
70-
pydocstyle = "^6.3.0"
71-
docker-compose = "^1.29.2"
52+
containers-sugar = "1.9.0"
53+
pytest = ">=7"
54+
blue = ">=0.9.1"
55+
isort = ">=5"
56+
pre-commit = ">=3"
57+
mypy = ">=1"
58+
pytest-cov = ">=3.0.0"
59+
mkdocs = ">=1.3"
60+
mkdocs-exclude = ">=1.0.2"
61+
mkdocs-jupyter = ">=0.20.0"
62+
mkdocs-literate-nav = ">=0.4.1"
63+
mkdocs-macros-plugin = ">=0.6.3"
64+
mkdocs-material = ">=8"
65+
mkdocstrings = {version=">=0.19.0", extras=["python"]}
66+
ruff = ">=0.0.278"
67+
bandit = ">=1.7.5"
68+
vulture = ">=2.7"
69+
pydocstyle = ">=6.3.0"
70+
compose-go = ">=2.20.2"
7271

7372
[build-system]
74-
requires = ["poetry-core>=1.0.0"]
73+
requires = ["poetry-core>=1.0.0", "poetry>=1.5.1"]
7574
build-backend = "poetry.core.masonry.api"
7675

7776
[tool.pytest.ini_options]

tests/.makim-complex.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,14 +195,14 @@ groups:
195195
help: build necessary docker image
196196
run: |
197197
pwd
198-
kxgr pull --all
199-
kxgr build --all
200-
kxgr ext restart --all --options -d
198+
sugar pull --all
199+
sugar build --all
200+
sugar ext restart --all --options -d
201201
run:
202202
help: test running a docker service using containers-sugar
203203
dependencies:
204204
- target: containers.setup
205205
shell: bash
206206
run: |
207-
kxgr exec --service service1 --options -T --cmd python -c "print(1)"
208-
kxgr stop --all
207+
sugar exec --service service1 --options -T --cmd python -c "print(1)"
208+
sugar stop --all

0 commit comments

Comments
 (0)