Merge pull request #1 from matyaskuti/main

Update dependency versions in main and generated projects
matyaskuti · Mar 3, 2023 · 1a094f4 · 1a094f4
2 parents 89d53b7 + d9f4337
commit 1a094f4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/pylintrc b/pylintrc
@@ -11,7 +11,7 @@ class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,32}|(__.*__))$
 inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
 
 [MESSAGES CONTROL]
-disable = missing-docstring,  locally-disabled, too-few-public-methods, fixme, bad-continuation
+disable = missing-docstring,  locally-disabled, too-few-public-methods, fixme
 msg-template = {module}:{line} [{msg_id}: {symbol}] - {msg}
 
 [REPORTS]

diff --git a/setup.py b/setup.py
@@ -22,15 +22,15 @@
     install_requires=["cookiecutter>=1.4<2"],
     extras_require={
         "lint": [
-            "flake8<4",
-            "black==19.3b0",
+            "flake8<7",
+            "black<24",
             "pylint<3",
-            "mypy<0.800"
+            "mypy<2"
         ],
         "test": [
-            "pytest<5",
+            "pytest<8",
             "pytest-cookies<1",
-            "pytest-cov<3",
+            "pytest-cov<5",
         ],
     },
     zip_safe=False,

diff --git a/tests/test_project_creation.py b/tests/test_project_creation.py
@@ -184,4 +184,4 @@ def test_build(cookies):
         check_output_in_result_dir("make build", result)
         with inside_directory_of(result):
             for pattern in EXPECTED_BUILD_PATTERNS:
-                assert glob.glob(pattern) != []
+                assert glob.glob(pattern)
diff --git a/tests/util.py b/tests/util.py
@@ -19,11 +19,9 @@ def generate_temporary_project(
 
 @contextlib.contextmanager
 def inside_directory_of(result: Any) -> Iterator[None]:
-    try:
-        old_dir = result.project.chdir()
-        yield
-    finally:
-        os.chdir(old_dir)
+    old_dir = result.project.chdir()
+    yield
+    os.chdir(old_dir)
 
 
 def check_output_in_result_dir(command: str, result: Any) -> str:

diff --git a/{{cookiecutter.package_name}}/pylintrc b/{{cookiecutter.package_name}}/pylintrc
@@ -11,7 +11,7 @@ class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,32}|(__.*__))$
 inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
 
 [MESSAGES CONTROL]
-disable = missing-docstring,  locally-disabled, too-few-public-methods, fixme, bad-continuation
+disable = missing-docstring,  locally-disabled, too-few-public-methods, fixme
 msg-template = {module}:{line} [{msg_id}: {symbol}] - {msg}
 
 [REPORTS]

diff --git a/{{cookiecutter.package_name}}/setup.py b/{{cookiecutter.package_name}}/setup.py
@@ -22,8 +22,8 @@
     install_requires=[],
     extras_require={
         "build": ["wheel<1"],
-        "lint": ["flake8<4", "black==19.3b0"{%- if cookiecutter.use_pylint == "y" %}, "pylint<3"{%- endif%}{%- if cookiecutter.use_mypy == "y" %}, "mypy<0.800"{%- endif%}],
-        "test": ["pytest<5", "pytest-cov<3"],
+        "lint": ["flake8<7", "black<24"{%- if cookiecutter.use_pylint == "y" %}, "pylint<3"{%- endif%}{%- if cookiecutter.use_mypy == "y" %}, "mypy<2"{%- endif%}],
+        "test": ["pytest<8", "pytest-cov<5"],
     },
     zip_safe=False,
 )