chore(package): Add poetry.lock again to the repo (#92)

osl-incubator · Feb 6, 2024 · 69ec1f9 · 69ec1f9
1 parent 115350e
commit 69ec1f9
Show file tree

Hide file tree

Showing 7 changed files with 2,895 additions and 6 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -93,6 +93,9 @@ jobs:
         auto-update-conda: true
         conda-solver: libmamba
 
+    - name: Check Poetry lock
+      run: poetry check
+
     - name: Install dependencies
       run: |
         poetry config virtualenvs.create false

diff --git a/.gitignore b/.gitignore
@@ -127,6 +127,3 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
-
-# poetry: remove poetry.lock in order to avoid issues in the installation
-poetry.lock
diff --git a/conda/dev.yaml b/conda/dev.yaml
@@ -14,3 +14,6 @@ dependencies:
   - pip:
     # note: workaround ci issue for macos
     - setuptools >= 40.8.0
+    - wheel >=0.42.0
+    # fix the distlib issue
+    - paginate >=0.5
diff --git a/conda/release.yaml b/conda/release.yaml
@@ -6,3 +6,7 @@ dependencies:
   - python >=3.8.1,<3.12  # min version supported
   - poetry >=1.5
   - nodejs >=18.17  # used by semantic-release
+  - pip
+  - pip:
+    # fix the distlib issue
+    - paginate >=0.5
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -87,10 +87,10 @@ select = [
   "I002", # isort
 ]
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "numpy"
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 # Use a single line between direct and from import
 lines-between-types = 1
 

diff --git a/src/makim/core.py b/src/makim/core.py
@@ -445,7 +445,7 @@ def _run_command(self, args: dict):
             args_input[k_clean] = default
 
             input_flag = f'--{k}'
-            if input_flag in args and args[input_flag]:
+            if args.get(input_flag):
                 if action == 'store_true':
                     args_input[k_clean] = (
                         True if args[input_flag] is None else args[input_flag]