Run test (#87)

* Run test * Update tests * Updated tests and requirements.txt * Updated tests and requirements.txt
adobe · Feb 28, 2019 · 4337498 · 4337498
1 parent c0f0339
commit 4337498
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2
 jobs:
-  test_api_and_main:
+  test_api_and_main_and_upload:
     docker:
       - image: circleci/python
     steps:
@@ -15,25 +15,15 @@ jobs:
             cd /home/circleci/project/
             pip3 install --user -r requirements.txt
       - run:
-          name: test api
+          name: test main
           command: |
             cd /home/circleci/project/
-            python3 tests/api_tests.py 
+            python3 tests/main_tests.py 
       - run:
-          name: test maim
+          name: test api
           command: |
             cd /home/circleci/project/
-            python3 tests/main_tests.py 
-            
-  build:
-    docker:
-      - image: circleci/python
-    steps:
-      - checkout
-      - run: 
-          name: init .pypirc
-          command: |
-            echo -e "[pypi]" >> ~/.pypirc
+            python3 tests/api_tests.py
       - run:
           name: create packages
           command: |
@@ -44,11 +34,10 @@ jobs:
           command: |
             python3 -m pip install --user --upgrade twine
             python3 -m twine upload dist/* -u $PYPI_USERNAME -p $PYPI_PASSWORD || echo "Package already exists"
+            
+
 workflows:
   version: 2
-  test_api_and_main:
-    jobs:
-      - test_api_and_main
-  build_and_upload:
+  test_api_and_main_and_upload:
     jobs:
-      - build
+      - test_api_and_main_and_upload
diff --git a/requirements.txt b/requirements.txt
@@ -12,3 +12,4 @@ xmltodict==0.11.0
 
 # Testing
 nose2==0.7.3
+regex