diff --git a/.gitignore b/.gitignore index 29119ae4..56288cb4 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ type_info.json shelf/ tests/.sv/ +.history/ diff --git a/.mergify.yml b/.mergify.yml index da893af2..1339fc8f 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -9,10 +9,12 @@ pull_request_rules: conditions: - label!=no-mergify - '#approved-reviews-by>=1' - - status-success=Travis CI - Pull Request - - status-success=continuous-integration/appveyor/pr + - status-success=Python package / build (ubuntu-latest, 3.8) (pull_request) + - status-success=Python package / build (windows-latest, 3.8) (pull_request) + - status-success=Python package / build (macos-latest, 3.8) (pull_request) - status-success=codecov/project - status-success=pyup.io/safety-ci + - name: Automatic Merge for my PRs actions: merge: @@ -23,17 +25,19 @@ pull_request_rules: conditions: - label!=no-mergify - author=neongraal - - status-success=Travis CI - Pull Request - - status-success=continuous-integration/appveyor/pr + - status-success=Python package / build (ubuntu-latest, 3.8) (pull_request) + - status-success=Python package / build (windows-latest, 3.8) (pull_request) + - status-success=Python package / build (macos-latest, 3.8) (pull_request) - status-success=codecov/project - status-success=pyup.io/safety-ci - + - name: Automatic merge for PyUp PRs conditions: - label!=no-mergify - author=pyup-bot - - status-success=Travis CI - Pull Request - - status-success=continuous-integration/appveyor/pr + - status-success=Python package / build (ubuntu-latest, 3.8) (pull_request) + - status-success=Python package / build (windows-latest, 3.8) (pull_request) + - status-success=Python package / build (macos-latest, 3.8) (pull_request) - status-success=codecov/project - status-success=pyup.io/safety-ci actions: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2d4dd672..00000000 --- a/.travis.yml +++ /dev/null @@ -1,37 +0,0 @@ -language: python - -os: linux - -install: pip install -U tox-travis codecov coverage - -script: tox - -jobs: - include: - - python: 3.6 - env: TOXENV=py36 - - python: 3.7 - env: TOXENV=py37 - dist: xenial - - python: 3.8 - env: TOXENV=py38 - dist: xenial - - python: 3.9 - env: TOXENV=py39 - dist: xenial - allow_failures: - - python: 3.9 - -after_success: test $TOXENV = "py37" && coverage xml && codecov - -deploy: - provider: pypi - distributions: sdist bdist_wheel - username: neongraal - password: - secure: W2Pnmsp0QW6Z6YkAcloAILcCxtQjRCwLcN5XB5Uou9NsDrTaxkVitEE4vinlf2ACuJH0XvOCaLfyIGI3Vb7ZsxLP/MKg8gZUewjgNz09Y2Wvbx3FYvy/mJDof37Z+iruPfoJ4tceS/KVHRWWEfBuZCGgvONIIKUMRrcO+86DuquB8bsczJAPgGW/UPJ1aeyekAduyAYcRdVtgcRezT+DqlXWNiBHcdiLMvHs4oKU9GQIculfICXrrd3gkOLhnr9wwJSquNkKRZL3m3u006JWEilqXAEPOEOvzg3lRwQ9m005VfJXVpVPMTMVF0znnJmbzYdfGi2MfwpxJuf63U8MchTXjTHYMplEYBSLW4sm2sGoJfwCUwk805gtceT6yiW2Jw8R/bPnwvPV1x97KKUotXRVuZ9IF13QZXWtxbqa/RXdPq3p4dPZ0TtczqcfNEwdQvFOdsvW2byfGe/8+eUmp0JMlKMmSh9iFB4/Pxf54puVr/wyh8g5VNayIVX15rLnjNDTbseA6fx5IoBtgfrUxgubiH18rVHlrjJzgZmnvmQ1Mtbq80zkCmyRqDkOzzjcTWy5Sh/N2f9fg6dQ7RuVoXggNFDFBTfed0ukygVfmn9LbI/svi5zKPyxqNO05z7OvyRooAFWKqiSAjUNKPCwuTxW31MMooAF2fbgOxxMZwU= - on: - tags: true - repo: NeonGraal/script-venv - python: 3.7 - diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 873d37b8..e6f471cf 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -102,9 +102,8 @@ Before you submit a pull request, check that it meets these guidelines: 2. If the pull request adds functionality, the docs should be updated. Put your new functionality into a function with a docstring, and add the feature to the list in README.rst. -3. The pull request should work for Python 3.6, 3.7, 3.8, 3.9, and for PyPy. Check - https://travis-ci.org/neongraal/script_venv/pull_requests - and make sure that the tests pass for all supported Python versions. +3. The pull request should work for Python 3.6, 3.7, 3.8, 3.9, and for PyPy. + Check that the tests pass for all supported Python versions. Tips ---- @@ -125,4 +124,4 @@ $ bumpversion patch # possible: major / minor / patch $ git push $ git push --tags -Travis will then deploy to PyPI if tests pass. +A GitHub action will then deploy to PyPI if tests pass. diff --git a/README.rst b/README.rst index cc9b9389..2c932af5 100644 --- a/README.rst +++ b/README.rst @@ -10,14 +10,8 @@ Script Venv :target: https://script-venv.readthedocs.io/en/latest/?badge=latest :alt: Documentation Status - -.. image:: https://img.shields.io/travis/NeonGraal/script-venv.svg?label=travis&logo=travis - :target: https://travis-ci.org/NeonGraal/script-venv - :alt: Travis CI (for Linux) - -.. image:: https://img.shields.io/appveyor/ci/NeonGraal/script-venv.svg?label=appveyor&logo=appveyor - :target: https://ci.appveyor.com/project/NeonGraal/script-venv - :alt: Appveyor CI (for Windows) +.. image:: https://github.com/NeonGraal/script-venv/workflows/Python%20package/badge.svg + :alt: Github Actions .. image:: https://img.shields.io/codecov/c/github/NeonGraal/script-venv.svg :target: https://codecov.io/gh/NeonGraal/script-venv @@ -76,3 +70,7 @@ This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypack .. _Cookiecutter: https://github.com/audreyr/cookiecutter .. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage + +Python dependencies scanned by PyUp.io_ + +.. _PyUp.io: https://pyup.io/ diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 4734139f..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,51 +0,0 @@ -image: Visual Studio 2019 - -environment: - - matrix: - - # For Python versions available on Appveyor, see - # http://www.appveyor.com/docs/installed-software#python - # The list here is complete (excluding Python 2.6, which - # isn't covered by this document) at the time of writing. - - - PYTHON: "C:\\Python36" - - PYTHON: "C:\\Python37" - - PYTHON: "C:\\Python38" - - PYTHON: "C:\\Python39" - - PYTHON: "C:\\Python36-x64" - - PYTHON: "C:\\Python37-x64" - - PYTHON: "C:\\Python38-x64" - - PYTHON: "C:\\Python39-x64" - -matrix: - allow_failures: - - PYTHON: "C:\\Python39-x64" - -install: - # We need wheel installed to build wheels - - "%PYTHON%\\python.exe -m pip install -U wheel sphinx setuptools" - -build: off - -max_jobs: 4 - -test_script: - # Put your test command here. - # Note that you must use the environment variable %PYTHON% to refer to - # the interpreter you're using - Appveyor does not do anything special - # to put the Python version you want to use on PATH. - - "%PYTHON%\\python.exe setup.py test" - -after_test: - # This step builds your wheels. - - "%PYTHON%\\python.exe setup.py bdist_wheel" - -artifacts: - # bdist_wheel puts your built wheel in the dist directory - - path: dist\* - -#on_success: -# You can use this step to upload your artifacts to a public website. -# See Appveyor's documentation for more details. Or you can simply -# access your wheels from the Appveyor "artifacts" tab for your build. diff --git a/tox.ini b/tox.ini index 0fd51783..9b6f35b0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,7 @@ [tox] envlist = py35, py36, py37, py38 -[travis] -python = - 3.6: py36 - 3.7: py37 - 3.8: py38 - 3.9: py39 - [testenv] -passenv = CI TRAVIS TRAVIS_* setenv = PYTHONPATH = {toxinidir} deps =