From b408d9d9130f390a46c0958cf0e182fe7e1da1ad Mon Sep 17 00:00:00 2001
From: sepandhaghighi <sepand.haghighi@yahoo.com>
Date: Sat, 16 Oct 2021 01:21:06 +0330
Subject: [PATCH] fix : test system modified

---
 .github/workflows/{test2.yml => test.yml} | 16 +++++++---
 .github/workflows/test1.yml               | 37 -----------------------
 2 files changed, 12 insertions(+), 41 deletions(-)
 rename .github/workflows/{test2.yml => test.yml} (74%)
 delete mode 100644 .github/workflows/test1.yml

diff --git a/.github/workflows/test2.yml b/.github/workflows/test.yml
similarity index 74%
rename from .github/workflows/test2.yml
rename to .github/workflows/test.yml
index a4d0e6f..96b5a95 100644
--- a/.github/workflows/test2.yml
+++ b/.github/workflows/test.yml
@@ -1,18 +1,18 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: CI (NFT Upload + Other)
+name: CI
 
 on: [push, pull_request]
 
 jobs:
   build:
+
     runs-on: ${{ matrix.os }}
-    environment: TEST_SECRET
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        python-version: [3.7]
+        os: [ubuntu-latest, windows-latest]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -31,19 +31,27 @@ jobs:
       run: |
         python otherfiles/requirements-splitter.py
         pip install --upgrade --upgrade-strategy=only-if-needed -r test-requirements.txt
+    - name: Test with pytest
+      run: |
+        python -m pytest --ignore-glob="*nft_upload_test.py" test --cov=samila --cov-report=term
+      if: matrix.python-version != 3.5
     - name: Test with pytest (+ NFT upload test)
       run: |
         python -m pytest test --cov=samila --cov-report=term
       env:
         NFT_STORAGE_API_KEY: ${{ secrets.NFT_STORAGE_API_KEY }}
+      if: matrix.python-version == 3.7 && matrix.os == 'ubuntu-latest'
     - name: Version check
       run: |
         python otherfiles/version_check.py
+      if: matrix.python-version == 3.7
     - name: Other tests
       run: |
         python -m vulture samila/ setup.py --min-confidence 65 --exclude=__init__.py --sort-by-size
         python -m bandit -r samila -s B311
         python -m pydocstyle -v --match-dir=samila
+      if: matrix.python-version == 3.7
     - name: Codecov
       run: |
         codecov
+      if: matrix.python-version == 3.7 && matrix.os == 'ubuntu-latest'
diff --git a/.github/workflows/test1.yml b/.github/workflows/test1.yml
deleted file mode 100644
index 1d8d0e8..0000000
--- a/.github/workflows/test1.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: CI (Main)
-
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install package
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        python setup.py install
-    - name: First test
-      run: |
-        python -m samila
-    - name: Test requirements Installation
-      run: |
-        python otherfiles/requirements-splitter.py
-        pip install --upgrade --upgrade-strategy=only-if-needed -r test-requirements.txt
-    - name: Test with pytest
-      run: |
-        python -m pytest --ignore-glob="*nft_upload_test.py" test --cov=samila --cov-report=term
-      if: matrix.python-version != 3.5