From b64dadd6e7f083dda993fa6815481cff7eab1471 Mon Sep 17 00:00:00 2001 From: James Adams Date: Fri, 31 Jan 2020 12:13:54 -0500 Subject: [PATCH] removed commented-out lines from the (now working) tox and CircleCI config files #53 --- .circleci/config.yml | 34 ---------------------------------- tox.ini | 2 -- 2 files changed, 36 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a86532d..dcc52b0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,36 +2,6 @@ # # Check https://circleci.com/docs/2.0/language-python/ for more details # - -# ------ WORKFLOW VERSION ------ -#version: 2 -#jobs: -# -# # using tox -# toxify: -# -# docker: -# - image: circleci/python:3.7 -# -# steps: -# - checkout -# # download and cache dependencies -# - restore_cache: -# keys: -# - v1-dependencies-{{ checksum "requirements.txt" }} -# # fallback to using the latest cache if no exact match is found -# - v1-dependencies- -# -# - run: pip install tox && tox -# -#workflows: -# version: 2 -# -# cvdata: -# jobs: -# - toxify - -# ------ NON-WORKFLOW VERSION ------ jobs: build: docker: @@ -73,12 +43,8 @@ jobs: command: | . venv/bin/activate tox -# coverage run tests # store artifacts (for example logs, binaries, etc) # to be available in the web app or through the API - store_artifacts: path: test-reports - -# - store_test_results: -# path: test-results diff --git a/tox.ini b/tox.ini index 8bced78..a16b831 100644 --- a/tox.ini +++ b/tox.ini @@ -23,6 +23,4 @@ deps = commands = python setup.py check -m -s coverage run -m pytest tests {posargs} -; py.test tests {posargs} -; coverage xml -i codecov