From 204523993681d4cb52c6fca6d6f9c236a002b305 Mon Sep 17 00:00:00 2001 From: henry senyondo Date: Sun, 18 Dec 2022 17:42:43 -0500 Subject: [PATCH 1/6] Create python-package.yml Use GitHub actions --- .github/workflows/python-package.yml | 40 ++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/python-package.yml diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml new file mode 100644 index 0000000..804e817 --- /dev/null +++ b/.github/workflows/python-package.yml @@ -0,0 +1,40 @@ +# This workflow will install Python dependencies, run tests and lint with a variety of Python versions +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python + +name: Python package + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: ["3.8", "3.9", "3.10"] + + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install flake8 pytest coveralls + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + - name: Lint with flake8 + run: | + # stop the build if there are Python syntax errors or undefined names + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: Test with pytest + run: | + pytest --cov cligj --cov-report term-missing From 0bacca39cb9e7f1b66a94addc9bf73910cefc482 Mon Sep 17 00:00:00 2001 From: henry senyondo Date: Sun, 18 Dec 2022 17:51:22 -0500 Subject: [PATCH 2/6] Add badge --- README.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.rst b/README.rst index 6e52cad..705090a 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,10 @@ cligj ====== +.. image:: https://github.com/mapbox/cligj/actions/workflows/python-package.yml/badge.svg + :alt: Python Workflow + :target: https://github.com/mapbox/cligj/actions/workflows/python-package.yml + .. image:: https://app.travis-ci.com/mapbox/cligj.svg?branch=master :target: https://app.travis-ci.com/mapbox/cligj From bf9f0c5c4b007d964229f434733d19ddc8eca45a Mon Sep 17 00:00:00 2001 From: henry senyondo Date: Sun, 18 Dec 2022 18:04:59 -0500 Subject: [PATCH 3/6] Update python-package.yml --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 804e817..0f65d6b 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -27,7 +27,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install flake8 pytest coveralls + python -m pip install flake8 pytest coveralls pytest-cov if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - name: Lint with flake8 run: | From e91acb7563b6e26f1337d5f92ab7a80a04b798a2 Mon Sep 17 00:00:00 2001 From: henrykironde Date: Sun, 18 Dec 2022 19:33:49 -0500 Subject: [PATCH 4/6] Due to compatibility issues that are not caused by the project we skip 3.7 ref : TheKevJames/coveralls-python#337 --- .github/workflows/python-package.yml | 3 +++ .travis.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 0f65d6b..9a14f21 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -29,6 +29,9 @@ jobs: python -m pip install --upgrade pip python -m pip install flake8 pytest coveralls pytest-cov if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + - name: Install cligj + run: | + pip install -e . - name: Lint with flake8 run: | # stop the build if there are Python syntax errors or undefined names diff --git a/.travis.yml b/.travis.yml index 55b7d13..189f230 100755 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,10 @@ sudo: false language: python python: - "3.6" - - "3.7" - "3.8" + - "3.9" install: - - "pip install coveralls==3.2.0" + - "pip install python-coveralls" - "pip install -e .[test]" script: - py.test --cov cligj --cov-report term-missing From 169e8980c1cdaa6055d734694f8fe623cc42507d Mon Sep 17 00:00:00 2001 From: henrykironde Date: Mon, 19 Dec 2022 00:41:04 -0500 Subject: [PATCH 5/6] Test versions of click fixes #39 --- .github/workflows/click-releases.yml | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/click-releases.yml diff --git a/.github/workflows/click-releases.yml b/.github/workflows/click-releases.yml new file mode 100644 index 0000000..0f7ddc5 --- /dev/null +++ b/.github/workflows/click-releases.yml @@ -0,0 +1,44 @@ +name: Click release package + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: ["3.9", "3.10"] + + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install pytest + if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + pip install -e . + + - name: Test with click latest release + run: | + pip install click --upgrade + pytest -v + + - name: Test with click==8.0.0 + run: | + pip install click==8.0.0 --upgrade + pytest -v + + - name: Test with click==7.0.0 + run: | + pip install click==7.0.0 --upgrade + pytest -v \ No newline at end of file From da6a194afc2b56b8f8c810e338c4434e7f98bada Mon Sep 17 00:00:00 2001 From: henry senyondo Date: Mon, 19 Dec 2022 00:51:38 -0500 Subject: [PATCH 6/6] Remove typo fixes #41 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3fd2f22..c5bab3a 100755 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setup( name="cligj", version=version, - description=u"Click params for commmand line interfaces to GeoJSON", + description=u"Click params for command line interfaces to GeoJSON", long_description=long_description, classifiers=[], keywords="",