From 7f0174e6a95ca4c6d7607a287b9ef53c2511b6c5 Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Mon, 3 May 2021 16:27:23 +0100 Subject: fixes for actios --- datamaps/tests/test_cli.py | 2 +- dm.spec | 3 ++- noxfile.py | 2 +- requirements_dev.txt | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/datamaps/tests/test_cli.py b/datamaps/tests/test_cli.py index 2e6ace2..abad923 100644 --- a/datamaps/tests/test_cli.py +++ b/datamaps/tests/test_cli.py @@ -157,7 +157,7 @@ def test_export_with_alternative_datamap_not_csv(mock_config, resource_dir, capl else: assert ( "Reading datamap /tmp/Documents/datamaps/input/datamap_alternate.csv" - not in [x[2] for x in caplog.record_tuples] + in [x[2] for x in caplog.record_tuples] ) diff --git a/dm.spec b/dm.spec index 894b93b..8f38d2e 100644 --- a/dm.spec +++ b/dm.spec @@ -1,10 +1,11 @@ # -*- mode: python ; coding: utf-8 -*- + block_cipher = None a = Analysis(['cli.py'], - pathex=['C:\\Users\\lemon\\code\\python\\datamaps'], + pathex=['/home/lemon/code/python/datamaps'], binaries=[], datas=[], hiddenimports=[], diff --git a/noxfile.py b/noxfile.py index cf6d785..98e65d2 100644 --- a/noxfile.py +++ b/noxfile.py @@ -7,4 +7,4 @@ import nox def tests(session): session.run("pip", "install", "-r", "requirements.txt", external=True) session.run("pip", "install", "-r", "requirements_dev.txt", external=True) - session.run("pytest -q") + session.run("pytest", "-q", "--show-capture=no", external=True) diff --git a/requirements_dev.txt b/requirements_dev.txt index 81c15dd..aa17fd4 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -2,8 +2,8 @@ pytest==5.4.1 pytest-cov==2.7.1 coverage==5.1 nox==2019.11.9 -pyinstaller==4.2 -wheel==0.34.2 +pyinstaller +wheel pefile==2019.4.18 pywin32-ctypes==0.2.0 -- cgit v1.2.3