Skip to content

Commit

Permalink
update py36 setup
Browse files Browse the repository at this point in the history
  • Loading branch information
fcakyon committed Feb 12, 2021
1 parent 8395769 commit 1a748b0
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 92 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,13 @@ jobs:
restore-keys: ${{ matrix.os }}-${{ matrix.python-version }}-
- name: Update pip
run: python -m pip install --upgrade pip
- name: Install dependencies for Python 3.6
- name: Install numpy for Python 3.6
if: matrix.python-version == 3.6
run: >
pip install -r requirements36.txt
- name: Install dependencies for Python 3.7&3.8
if: matrix.python-version >= 3.7
pip install "numpy>=1.18.5,<1.20"
- name: Install dependencies
run: >
pip install -r requirements.txt
- name: Test with unittest
run: |
pip install pytest
python -m unittest
6 changes: 5 additions & 1 deletion .github/workflows/package_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,13 @@ jobs:
restore-keys: ${{ matrix.os }}-${{ matrix.python-version }}-
- name: Update pip
run: python -m pip install --upgrade pip
- name: Install numpy for Python 3.6
if: matrix.python-version == 3.6
run: >
pip install "numpy>=1.18.5,<1.20"
- name: Install latest YOLOv5 package
run: >
pip install -U yolov5
pip install --upgrade --force-reinstall yolov5
- name: Test with unittest
run: |
python -m unittest
1 change: 0 additions & 1 deletion .github/workflows/publish_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@ jobs:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python setup36.py bdist_wheel
python setup.py sdist bdist_wheel
twine upload --verbose --skip-existing dist/*
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,19 @@ This package is up-to-date with the latest release of [ultralytics/yolov5](https

## Installation

- Install yolov5 using pip:
- Install yolov5 using pip (for Python >=3.7):

```console
pip install yolov5
```

- Install yolov5 using pip (for Python 3.6):

```console
pip install "numpy>=1.18.5,<1.20"
pip install yolov5
```

## Basic Usage

```python
Expand Down
30 changes: 0 additions & 30 deletions requirements36.txt

This file was deleted.

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ def get_version():
long_description_content_type="text/markdown",
url="https://github.com/fcakyon/yolov5-python",
packages=setuptools.find_packages(exclude=["tests"]),
python_requires=">=3.7",
python_requires=">=3.6",
install_requires=get_requirements(),
extras_require={"tests": ["pytest"]},
options={'bdist_wheel':{'python_tag':'py37.py38'}},
options={'bdist_wheel':{'python_tag':'py36.py37.py38'}},
classifiers=[
"License :: OSI Approved :: GNU General Public License (GPL)",
"Operating System :: OS Independent",
Expand Down
52 changes: 0 additions & 52 deletions setup36.py

This file was deleted.

0 comments on commit 1a748b0

Please sign in to comment.