From 45388e305d8775442d39d31d9aec140d494f9244 Mon Sep 17 00:00:00 2001 From: Jochen Parmentier Date: Thu, 22 Oct 2020 10:58:41 +0200 Subject: [PATCH] Replacing travis with Dephell Action --- .github/workflows/main.yml | 48 ++++++++++++++++++++++++++++++++++++++ .travis.yml | 39 ------------------------------- README.md | 2 +- appveyor.yml | 14 +++++------ pyproject.toml | 5 ++-- requirements-flake.txt | 10 ++++++-- 6 files changed, 67 insertions(+), 51 deletions(-) create mode 100644 .github/workflows/main.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..eafe0e2 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,48 @@ +name: dephell_discover + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + pytest: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: + - "3.6" + - "3.7" + - "3.8" + - pypy3 + steps: + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Checkout + uses: actions/checkout@v2 + - name: Run DepHell + uses: dephell/dephell_action@master + + linters: + runs-on: ubuntu-latest + strategy: + matrix: + dephell-env: + - flake8 + - typing + steps: + - name: Setup Python + uses: actions/setup-python@v2 + with: + python-version: "3.7" + - name: Checkout + uses: actions/checkout@v2 + - name: Run DepHell + uses: dephell/dephell_action@master + with: + dephell-env: ${{ matrix.dephell-env }} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f43b944..0000000 --- a/.travis.yml +++ /dev/null @@ -1,39 +0,0 @@ -language: python - -# do not run Travis for PR's twice (as for push and as for PR) -branches: - only: - - master - -before_install: - # show a little bit more information about environment - - sudo apt-get install -y tree - - env - - tree - # install DepHell - # https://github.com/travis-ci/travis-ci/issues/8589 - - curl https://raw.githubusercontent.com/dephell/dephell/master/install.py | /opt/python/3.6.7/bin/python - - dephell inspect self -install: - - dephell venv create --env=$ENV --python="/opt/python/$TRAVIS_PYTHON_VERSION/bin/python" - - dephell deps install --env=$ENV -script: - - dephell venv run --env=$ENV - -matrix: - include: - - python: "3.5" - env: ENV=pytest - - python: "3.6.7" - env: ENV=pytest - - python: "3.7-dev" - env: ENV=pytest - - python: "3.8-dev" - env: ENV=pytest - - python: "pypy3.5" - env: ENV=pytest - - - python: "3.7" - env: ENV=flake8 - - python: "3.7" - env: ENV=typing diff --git a/README.md b/README.md index debbc71..d06b873 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Dephell Discover -[![travis](https://travis-ci.org/dephell/dephell_discover.svg?branch=master)](https://travis-ci.org/dephell/dephell_discover) +![GitHub Actions Master branch](https://github.com/dephell/dephell_discover/workflows/dephell_discover/badge.svg?branch=master) [![appveyor](https://ci.appveyor.com/api/projects/status/github/dephell/dephell_discover?svg=true)](https://ci.appveyor.com/project/orsinium/dephell-discover) [![MIT License](https://img.shields.io/pypi/l/dephell-discover.svg)](https://github.com/dephell/dephell_discover/blob/master/LICENSE) diff --git a/appveyor.yml b/appveyor.yml index d055144..be6fbea 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,13 +5,6 @@ build: false environment: matrix: - - PYTHON: "C:\\Python35-x64" - PYTHON_VERSION: "3.5.x" - ARCH: "64" - WINDOWS_SDK_VERSION: "v7.1" - PLAT_NAME: "win-amd64" - PY_TAG: "cp35" - - PYTHON: "C:\\Python36-x64" PYTHON_VERSION: "3.6.x" ARCH: "64" @@ -26,6 +19,13 @@ environment: PLAT_NAME: "win-amd64" PY_TAG: "cp37" + - PYTHON: "C:\\Python38-x64" + PYTHON_VERSION: "3.8.x" + ARCH: "64" + WINDOWS_SDK_VERSION: "v7.1" + PLAT_NAME: "win-amd64" + PY_TAG: "cp38" + init: - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%" diff --git a/pyproject.toml b/pyproject.toml index 62f74e8..f7e2729 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,7 @@ [tool.dephell.main] from = {format = "poetry", path = "pyproject.toml"} to = {format = "setuppy", path = "setup.py"} +tag = "v." [tool.dephell.flake8] from = {format = "pip", path = "requirements-flake.txt"} @@ -38,5 +39,5 @@ classifiers = [ ] [tool.poetry.dependencies] -python = ">=3.5" -attrs = "*" +python = ">=3.6" +attrs = "*" \ No newline at end of file diff --git a/requirements-flake.txt b/requirements-flake.txt index f8944e5..cc46307 100644 --- a/requirements-flake.txt +++ b/requirements-flake.txt @@ -1,11 +1,10 @@ flake8 +flake8-comprehensions # https://github.com/adamchainz/flake8-comprehensions flake8-alfred # https://github.com/datatheorem/flake8-alfred flake8-blind-except # https://github.com/elijahandrews/flake8-blind-except -flake8-broken-line # https://github.com/sobolevn/flake8-broken-line flake8-bugbear # https://github.com/PyCQA/flake8-bugbear flake8-commas # https://github.com/PyCQA/flake8-commas -flake8-comprehensions # https://github.com/adamchainz/flake8-comprehensions flake8-debugger # https://github.com/JBKahn/flake8-debugger flake8-logging-format # https://github.com/globality-corp/flake8-logging-format flake8-mutable # https://github.com/ebeweber/flake8-mutable @@ -14,3 +13,10 @@ flake8-quotes # https://github.com/zheller/flake8-quotes flake8-tidy-imports # https://github.com/adamchainz/flake8-tidy-imports flake8-variables-names # https://github.com/best-doctor/flake8-variables-names pep8-naming # https://github.com/PyCQA/pep8-naming + + +# flake8-string-format # https://github.com/xZise/flake8-string-format +# disabled: https://github.com/xZise/flake8-string-format/issues/16 + +# flake8-broken-line # https://github.com/sobolevn/flake8-broken-line +# disabled: https://github.com/sobolevn/flake8-broken-line/issues/38 \ No newline at end of file