From 6e64ba6c18f0c15fdf14494286aaee828a940b62 Mon Sep 17 00:00:00 2001
From: Sam <samira.elaabidi@transferwise.com>
Date: Wed, 18 Mar 2020 17:08:21 +0200
Subject: [PATCH] Update dependencies

---
 .circleci/config.yml | 21 +++++++++++++++++----
 Makefile             |  4 +++-
 setup.py             |  7 +++----
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index eda5d4c..d3800f6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,14 +13,27 @@ jobs:
       - run:
           name: 'Setup virtualenv'
           command: |
-            mkdir -p ~/.virtualenvs
-            python3 -m venv ~/.virtualenvs/singer-python
-            source ~/.virtualenvs/singer-python/bin/activate
+            python3 -m venv virtualenv
+            source virtualenv/bin/activate
             pip install -U pip setuptools
             make install
+
+      - run:
+          name: 'Conflicts check'
+          command: |
+            source virtualenv/bin/activate
+            pip check && echo "No conflicts" || exit 1
+
+      - run:
+          name: 'Pylinting'
+          command: |
+            # Need to re-activate the virtualenv
+            source virtualenv/bin/activate
+            make pylinting
+
       - run:
           name: 'Run tests'
           command: |
             # Need to re-activate the virtualenv
-            source ~/.virtualenvs/singer-python/bin/activate
+            source virtualenv/bin/activate
             make test
diff --git a/Makefile b/Makefile
index d1fc4f8..734843c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@ check_prereqs:
 install: check_prereqs
 	python3 -m pip install -e '.[dev]'
 
-test: install
+pylinting:
 	pylint singer -d missing-docstring,broad-except,bare-except,too-many-return-statements,too-many-branches,too-many-arguments,no-else-return,too-few-public-methods,fixme,protected-access
+
+test:
 	nosetests --with-doctest -v
diff --git a/setup.py b/setup.py
index 87c59a4..a094221 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
     long_description = fh.read()
 
 setup(name="pipelinewise-singer-python",
-      version='1.1.0',
+      version='1.1.1',
       description="Singer.io utility library - PipelineWise compatible",
       long_description=long_description,
       long_description_content_type="text/markdown",
@@ -17,7 +17,7 @@
       ],
       url="https://github.com/transferwise/pipelinewise-singer-python",
       install_requires=[
-          'pytz==2018.4',
+          'pytz==2019.3',
           'jsonschema==2.6.0',
           'simplejson==3.11.1',
           'python-dateutil>=2.6.0',
@@ -29,8 +29,7 @@
               'pylint',
               'ipython',
               'ipdb',
-              'nose',
-              'singer-tools'
+              'nose'
           ]
       },
       packages=['singer'],