From 46c5719e14338bf93442d88cd9ec8f35c6eb84df Mon Sep 17 00:00:00 2001 From: Josh Miklos Date: Mon, 22 Jun 2020 16:24:58 -0700 Subject: [PATCH] Removed direct dependency that blocked pypi. Added wheel to dev and installed dev for ci. --- .github/workflows/publish.yml | 3 +-- .github/workflows/pythonpackage.yml | 2 +- setup.py | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a87f90f..ea89b0f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,8 +15,7 @@ jobs: python-version: 3.7 - uses: dschep/install-poetry-action@v1.2 - name: Install and build - run: pip install . - pip install wheel + run: pip install .[dev] - name: Build with Poetry run: python setup.py sdist bdist_wheel - name: Publish distribution 📦 to Test PyPI diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index c4f8dfc..e3270e4 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -19,7 +19,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - run: pip install . + run: pip install .[dev] pip install wheel - name: Test with tox run: tox -p auto -o diff --git a/setup.py b/setup.py index 0326a7f..23f6028 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,9 @@ setup( "pyzmq==18.1.0", ], extras_require={ - "linux": ["PyV4L2Cam @ git+https://github.com/SimLeek/PyV4L2Cam"], + # pypi doesn't allow direct dependencies for security reasons, + # even though I could install a lot of viruses just from this setup.py + # "linux": ["PyV4L2Cam @ git+https://github.com/SimLeek/PyV4L2Cam"], "dev": [ "black==18.*,>=18.3.0.a0", "coverage==4.*,>=4.5.0", @@ -59,6 +61,7 @@ setup( "tox==3.*,>=3.14.0", "tox-gh-actions==0.*,>=0.3.0", "typing==3.7.4.1", + "wheel==0.*,>=0.30.0" ], }, )