From 5568ea989cedadea618dff599f1e7835dc6fee08 Mon Sep 17 00:00:00 2001 From: Tom Davidson Date: Thu, 9 May 2019 15:43:59 -0700 Subject: [PATCH 1/2] Check for conflicts in requirements during testing --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 2f49ede77..84a82a2c8 100644 --- a/tox.ini +++ b/tox.ini @@ -16,6 +16,7 @@ deps = -rrequirements.txt commands = + pip check # check for conflicting packages python test.py -v # Env to create coverage report locally From 5dc78d238aa8332e0c8c864c5e711aed58eb5f2f Mon Sep 17 00:00:00 2001 From: Tom Davidson Date: Thu, 9 May 2019 19:35:26 -0700 Subject: [PATCH 2/2] Release instructions: suggest checking for requirement conflicts --- docs/source/update_requirements.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/source/update_requirements.rst b/docs/source/update_requirements.rst index f5d094c7d..f5a18c879 100644 --- a/docs/source/update_requirements.rst +++ b/docs/source/update_requirements.rst @@ -27,6 +27,7 @@ the following script: cd pynwb pip install . + pip check # check for package conflicts pip freeze > requirements.txt deactivate @@ -54,6 +55,9 @@ the following scripts: # If relevant, you could pip install new requirements now # pip install -U + # Check for any conflicts in installed packages + pip check + # Update list of pinned requirements pip freeze > $target_requirements