Update test to pass on osx

conda · May 29, 2021 · d46e4c0 · d46e4c0
1 parent 4b300e8
commit d46e4c0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,23 +1,23 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.4.0
+  rev: v4.0.1
   hooks:
     - id: trailing-whitespace
     - id: check-ast
 
 - repo: https://gitlab.com/pycqa/flake8
-  rev: 3.8.4
+  rev: 3.9.2
   hooks:
     - id: flake8
 
 - repo: https://github.com/pycqa/isort
-  rev: 5.7.0
+  rev: 5.8.0
   hooks:
   - id: isort
     args: ["--profile", "black", "--filter-files"]
 
 - repo: https://github.com/psf/black
-  rev: 20.8b1
+  rev: 21.5b1
   hooks:
   - id: black
     language_version: python3

diff --git a/conda_lock/src_parser/selectors.py b/conda_lock/src_parser/selectors.py
@@ -4,7 +4,7 @@
 
 
 def filter_platform_selectors(content: str, platform) -> Iterator[str]:
-    """"""
+    """ """
     # we support a very limited set of selectors that adhere to platform only
     platform_sel = {
         "linux-64": {"linux64", "unix", "linux"},

diff --git a/tests/test_conda_lock.py b/tests/test_conda_lock.py
@@ -266,6 +266,9 @@ def test_install(tmp_path, conda_exe, zlib_environment, monkeypatch):
             lock_filename_template,
         ],
     )
+    if result.exit_code != 0:
+        print(result.stdout, file=sys.stdout)
+        print(result.stderr, file=sys.stderr)
     assert result.exit_code == 0
 
     env_name = "test_env"
@@ -291,7 +294,7 @@ def invoke_install(*extra_args):
         "lockfile contents: \n\n=======\n%s\n\n==========",
         pathlib.Path(lock_filename).read_text(),
     )
-    if sys.platform.lower().startswith('linux'):
+    if sys.platform.lower().startswith("linux"):
         assert result.exit_code == 0
         assert _check_package_installed(
             package=package,

diff --git a/tests/zlib/conda-linux-64.lock b/tests/zlib/conda-linux-64.lock
@@ -2,7 +2,7 @@
 # env_hash: 3785fe554e946f6fcbd195fa2ce80493621fe6798c631d2e00b8df3f7c3c2282
 @EXPLICIT
 https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
-https://conda.anaconda.org/conda-forge/linux-64/libgomp-9.3.0-h2828fa1_18.tar.bz2#fc7a2a7e6a741c8afdd764715ac7039d
+https://conda.anaconda.org/conda-forge/linux-64/libgomp-9.3.0-h2828fa1_19.tar.bz2#ab0a307912033126da02507b59e79ec9
 https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-1_gnu.tar.bz2#561e277319a41d4f24f5c05a9ef63c04
-https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-9.3.0-h2828fa1_18.tar.bz2#5a9490c49a3505a6d19bda012cde6ad3
+https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-9.3.0-h2828fa1_19.tar.bz2#9d5cdfc51476ee4dcdd96ed2dca3f943
 https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.11-h516909a_1010.tar.bz2#339cc5584e6d26bc73a875ba900028c3