Merge pull request #27 from Workable/feature/multi_py3_test_env

[circle] Add py3.5 and py3.6 test jobs and build workflow

Author: sque

.circleci/config.yml

@@ -1,61 +1,103 @@
-# Python CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-python/ for more details
-#
 version: 2
+
 jobs:
-  build:
+  test-3.6: &test-template
+  # Job to run tests test on python 3.6
     docker:
-      # specify the version you desire here
-      # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
       - image: circleci/python:3.6
 
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/postgres:9.4
-
-    working_directory: ~/repo
+    environment:
+      PYTHON_BIN: python3
+      PYTHON_VERSION: 3.6
 
     steps:
       - checkout
 
       # Download and cache dependencies
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "setup.py" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
+          - v2-test-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}
 
       - run:
-          name: install dependencies
+          name: Install test dependencies
           command: |
-            python3 -m venv venv
+            ${PYTHON_BIN} -m venv venv
             . venv/bin/activate
             pip install -U pip
             pip install -U setuptools
-            pip install .
+            # Install package with dependencies
+            pip install .[test]
 
       - save_cache:
           paths:
             - ./venv
-          key: v1-dependencies-{{ checksum "setup.py" }}
+          key: v2-test-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}
+
+      # run Flake8!
+      - run:
+          name: Flake8 Compliance
+          command: |
+            . venv/bin/activate
+            ${PYTHON_BIN} setup.py flake8
 
       # run tests!
       - run:
           name: Unit-Tests
           command: |
             . venv/bin/activate
-            python setup.py test
+            pip install
+            ${PYTHON_BIN} setup.py nosetests
 
-      # run Flake8!
+  test-3.5:
+  # Clone-job to run tests test on python 3.6
+    <<: *test-template
+    docker:
+      - image: circleci/python:3.5
+
+    environment:
+      PYTHON_BIN: python3
+      PYTHON_VERSION: 3.5
+
+  build:
+    # Build and store artifacts
+
+    docker:
+      - image: circleci/python:3.6
+
+
+    steps:
+      - checkout
       - run:
-          name: Flake8 Compliance
+          name: Create environment
           command: |
+            python3 -m venv venv
             . venv/bin/activate
-            python setup.py flake8
+            pip install -U pip setuptools wheel
+
+      - run:
+          name: Build Source and Wheel distribution files
+          command: |
+            . venv/bin/activate
+            python setup.py sdist bdist_wheel
+            python setup.py --version > version.txt
+
+      - store_artifacts:
+          path: dist
+          destination: dist
+
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist
+            - version.txt
 
-#      # Build
-#      - store_artifacts:
-#          path: test-reports
-#          destination: test-reports
+workflows:
+  version: 2
+  test_build_deploy:
+    jobs:
+      - test-3.6
+      - test-3.5
+      - build:
+          requires:
+            - test-3.6
+            - test-3.5

setup.py

@@ -87,13 +87,18 @@ def index():
 import ast
 from setuptools import setup
 
-
 _version_re = re.compile(r'__version__\s+=\s+(.*)')
 
 with open('flask_log_request_id/__init__.py', 'rb') as f:
     version = str(ast.literal_eval(_version_re.search(
         f.read().decode('utf-8')).group(1)))
 
+test_requirements = [
+    'nose',
+    'mock==2.0.0',
+    'coverage~=4.3.4',
+    'celery~=4.1.0'
+]
 
 setup(
     name='Flask-Log-Request-ID',
@@ -117,15 +122,15 @@ def index():
     install_requires=[
         'Flask>=0.8',
     ],
-    tests_require=[
-        'nose',
-        'mock==2.0.0',
-        'coverage~=4.3.4',
-        'celery~=4.1.0'
-    ],
+    tests_require=test_requirements,
     setup_requires=[
-        "flake8"
+        "flake8",
+        "nose"
     ],
+    extras_require={
+        'test': test_requirements,
+        'celery': ["celery~=4.1.0"],
+    },
     test_suite='nose.collector',
     classifiers=[
         'Environment :: Web Environment', 'Intended Audience :: Developers',