fix(deps): Fix the dependencies pinning (osl-incubator#54)

.github/workflows/main.yaml

@@ -132,7 +132,7 @@ jobs:
       if: success() || failure()
       run: |
         pre-commit install
-        makim tests.lint
+        makim tests.linter
 
     - name: Setup tmate session
       if: "${{ failure() && (contains(github.event.pull_request.labels.*.name, 'ci:enable-debugging')) }}"

.makim.yaml

@@ -57,14 +57,32 @@ groups:
 
   tests:
     targets:
-      lint:
+      linter:
         help: Run linter tools
         run: pre-commit run --all-files --verbose
 
       unittest:
         help: Run tests
         run: pytest -s -vv tests
 
+      smoke:
+        help: Run smoke tests
+        dependencies:
+          - target: smoke-tests.simple
+          - target: smoke-tests.complex
+          - target: smoke-tests.containers
+          - target: smoke-tests.unittest
+          - target: smoke-tests.vars-env
+          - target: smoke-tests.bash
+
+      ci:
+        help: Run all targets used on CI
+        dependencies:
+          - target: tests.linter
+          - target: tests.unittest
+          - target: tests.smoke
+          - target: docs.build
+
   smoke-tests:
     targets:
       simple:

conda/dev.yaml

@@ -4,7 +4,5 @@ channels:
   - conda-forge
 dependencies:
   - python 3.8.1  # min version supported
-  - poetry >=1.3
+  - poetry >=1.5
   - nodejs  # used by semantic-release
-  # https://github.com/ionrock/cachecontrol/issues/292#issuecomment-1536120527
-  - urllib3 <2

docs/contributing.md

@@ -86,8 +86,9 @@ $ git checkout -b name-of-your-bugfix-or-feature
 6.  When you’re done makimg changes, check that your changes pass flake8
     and the tests, including testing other Python versions with tox::
 ```bash
-$ makim lint
-$ makim test
+$ makim tests.linter
+$ makim tests.unittest
+$ makim tests.smoke
 ```
 7.  Commit your changes and push your branch to GitHub::
 ```bash

pyproject.toml

@@ -41,37 +41,36 @@ exclude = [
 
 [tool.poetry.dependencies]
 python = "^3.8.1"
-sh = "^2.0.0"
+sh = ">=2.0.0"
 pyyaml = ">=5.0"
-jinja2 = "<3.0.3"
-xonsh = "^0.14.0"
-python-dotenv = "^0.21.1"
-colorama = "^0.4.6"
-urllib3 = "<2"
+jinja2 = ">=2.0"
+xonsh = ">=0.14.0"
+python-dotenv = ">=0.21.1"
+colorama = ">=0.4.6"
 
 [tool.poetry.group.dev.dependencies]
-containers-sugar = "1.7.0"
-pytest = "^7"
-blue = "^0.9.1"
-isort = "^5"
-pre-commit = "^3"
-mypy = "^1"
-pytest-cov = "^3.0.0"
-mkdocs = ">=1.2.3,<2"
-mkdocs-exclude = ">=1.0.2,<2"
-mkdocs-jupyter = ">=0.20.0,<1"
-mkdocs-literate-nav = ">=0.4.1,<1"
-mkdocs-macros-plugin = ">=0.6.3,<1"
-mkdocs-material = ">=8.2.1,<9"
-mkdocstrings = ">=0.17.0,<0.18.0"
-ruff = "^0.0.272"
-bandit = "^1.7.5"
-vulture = "^2.7"
-pydocstyle = "^6.3.0"
-docker-compose = "^1.29.2"
+containers-sugar = "1.9.0"
+pytest = ">=7"
+blue = ">=0.9.1"
+isort = ">=5"
+pre-commit = ">=3"
+mypy = ">=1"
+pytest-cov = ">=3.0.0"
+mkdocs = ">=1.3"
+mkdocs-exclude = ">=1.0.2"
+mkdocs-jupyter = ">=0.20.0"
+mkdocs-literate-nav = ">=0.4.1"
+mkdocs-macros-plugin = ">=0.6.3"
+mkdocs-material = ">=8"
+mkdocstrings = {version=">=0.19.0", extras=["python"]}
+ruff = ">=0.0.278"
+bandit = ">=1.7.5"
+vulture = ">=2.7"
+pydocstyle = ">=6.3.0"
+compose-go = ">=2.20.2"
 
 [build-system]
-requires = ["poetry-core>=1.0.0"]
+requires = ["poetry-core>=1.0.0", "poetry>=1.5.1"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.pytest.ini_options]

tests/.makim-complex.yaml

@@ -195,14 +195,14 @@ groups:
         help: build necessary docker image
         run: |
           pwd
-          kxgr pull --all
-          kxgr build --all
-          kxgr ext restart --all --options -d
+          sugar pull --all
+          sugar build --all
+          sugar ext restart --all --options -d
       run:
         help: test running a docker service using containers-sugar
         dependencies:
           - target: containers.setup
         shell: bash
         run: |
-          kxgr exec --service service1 --options -T --cmd python -c "print(1)"
-          kxgr stop --all
+          sugar exec --service service1 --options -T --cmd python -c "print(1)"
+          sugar stop --all