From 81f04a261f3850bf87f4d38b64107d640a2b56a8 Mon Sep 17 00:00:00 2001
From: Georgy Frolov <gosha@fro.lv>
Date: Mon, 1 Mar 2021 20:36:57 +0300
Subject: test executable

---
 .github/workflows/ci-standalone.yml |  9 +++----
 .github/workflows/ci.yml            | 49 -------------------------------------
 pyoxidizer.bzl                      |  1 -
 3 files changed, 4 insertions(+), 55 deletions(-)

diff --git a/.github/workflows/ci-standalone.yml b/.github/workflows/ci-standalone.yml
index 8c1ce79..c6c241f 100644
--- a/.github/workflows/ci-standalone.yml
+++ b/.github/workflows/ci-standalone.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
 
@@ -55,6 +55,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements-dev.txt
+          pip install -e .
 
       - name: Wait for MySQL connection
         run: |
@@ -66,11 +67,9 @@ jobs:
         env:
           PYTEST_PASSWORD: root
           PYTEST_HOST: 127.0.0.1
+          MYCLI_EXECUTABLE: ${{ env.GITHUB_WORKSPACE }}/build/i86*/release/install/mycli
         run: |
-          ./setup.py test --pytest-args="--cov-report= --cov=mycli"
+          behave test/features --no-capture
 
-      - name: Lint
-        run: |
-          ./setup.py lint --branch=HEAD
 
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9514846..0a14472 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,52 +62,3 @@ jobs:
           coverage combine
           coverage report
           codecov
-
-  macos:
-    strategy:
-      matrix:
-        python-version: [3.9]
-        include:
-
-    runs-on: macos-latest
-    steps:
-
-      - uses: actions/checkout@v2
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Start MySQL
-        run: |
-          sudo /etc/init.d/mysql start
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements-dev.txt
-          pip install --no-cache-dir -e .
-
-      - name: Wait for MySQL connection
-        run: |
-          while ! mysqladmin ping --host=localhost --port=3306 --user=root --password=root --silent; do
-            sleep 5
-          done
-
-      - name: Pytest / behave
-        env:
-          PYTEST_PASSWORD: root
-          PYTEST_HOST: 127.0.0.1
-        run: |
-          ./setup.py test --pytest-args="--cov-report= --cov=mycli"
-
-      - name: Lint
-        run: |
-          ./setup.py lint --branch=HEAD
-
-      - name: Coverage
-        run: |
-          coverage combine
-          coverage report
-          codecov
diff --git a/pyoxidizer.bzl b/pyoxidizer.bzl
index e246b5e..31b118f 100644
--- a/pyoxidizer.bzl
+++ b/pyoxidizer.bzl
@@ -18,7 +18,6 @@ def make_embedded_resources(exe):
 
 def make_install(exe):
     files = FileManifest()
-    exe.add_python_resources(exe.pip_install(['cryptography']))
     exe.add_python_resources(exe.pip_install(['.']))
     files.add_python_resource(".", exe)
 
-- 
cgit v1.2.3