Skip to content

Commit

Permalink
DOC/CI: remove Travis from docs and paths (#1632)
Browse files Browse the repository at this point in the history
* DOC/CI: remove Travis from docs and paths

* use envs

* fix

* typo

* how to trigger check
  • Loading branch information
martinfleis committed Oct 10, 2020
1 parent 63de9bd commit 7e595d0
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 37 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/tests.yaml
Expand Up @@ -27,30 +27,30 @@ jobs:
postgis: [false]
dev: [false]
env:
- ci/travis/36-minimal.yaml
- ci/travis/38-no-optional-deps.yaml
- ci/travis/36-pd025.yaml
- ci/travis/37-latest-defaults.yaml
- ci/travis/37-latest-conda-forge.yaml
- ci/travis/38-latest-conda-forge.yaml
- ci/envs/36-minimal.yaml
- ci/envs/38-no-optional-deps.yaml
- ci/envs/36-pd025.yaml
- ci/envs/37-latest-defaults.yaml
- ci/envs/37-latest-conda-forge.yaml
- ci/envs/38-latest-conda-forge.yaml
include:
- env: ci/travis/37-latest-conda-forge.yaml
- env: ci/envs/37-latest-conda-forge.yaml
os: macos-latest
postgis: false
dev: false
- env: ci/travis/38-latest-conda-forge.yaml
- env: ci/envs/38-latest-conda-forge.yaml
os: macos-latest
postgis: false
dev: false
- env: ci/travis/37-latest-conda-forge.yaml
- env: ci/envs/37-latest-conda-forge.yaml
os: windows-latest
postgis: false
dev: false
- env: ci/travis/38-latest-conda-forge.yaml
- env: ci/envs/38-latest-conda-forge.yaml
os: windows-latest
postgis: false
dev: false
- env: ci/travis/37-dev.yaml
- env: ci/envs/37-dev.yaml
os: ubuntu-latest
dev: true

Expand Down Expand Up @@ -115,10 +115,10 @@ jobs:
run: |
source activate test
conda install postgis -c conda-forge
source ci/travis/setup_postgres.sh
source ci/envs/setup_postgres.sh
pytest -v -r s --color=yes --cov=geopandas --cov-append --cov-report term-missing --cov-report xml geopandas/io/tests/test_sql.py | tee /dev/stderr | if grep SKIPPED >/dev/null;then echo "TESTS SKIPPED, FAILING" && exit 1;fi
- name: Test doctsrings
- name: Test docstrings
shell: bash
if: contains(matrix.env, '38-latest-conda-forge.yaml') && contains(matrix.os, 'ubuntu')
env:
Expand Down
14 changes: 6 additions & 8 deletions CONTRIBUTING.md
Expand Up @@ -10,8 +10,8 @@ readable code. Performance matters, but not at the expense of those
goals.

In general, GeoPandas follows the conventions of the pandas project
where applicable. Please read the [pandas contributing
guidelines](http://pandas.pydata.org/pandas-docs/stable/contributing.html).
where applicable. Please read the [contributing
guidelines](https://geopandas.readthedocs.io/en/latest/community/contributing.html).


In particular, when submitting a pull request:
Expand All @@ -22,11 +22,9 @@ In particular, when submitting a pull request:
as a guide).
- All existing tests should pass. Please make sure that the test
suite passes, both locally and on
[Travis CI](https://travis-ci.org/geopandas/geopandas). Status on
Travis will be visible on a pull request. If you want to enable
Travis CI on your own fork, please read the pandas guidelines link
above or the
[getting started docs](https://docs.travis-ci.com/user/tutorial/).
[GitHub Actions](https://github.com/geopandas/geopandas/actions). Status on
GHA will be visible on a pull request. GHA are automatically enabled
on your own fork as well. To trigger a check, make a PR to your own fork.

- New functionality should include tests. Please write reasonable
tests for your code and make sure that they pass on your pull request.
Expand All @@ -41,7 +39,7 @@ is a great way to get started if you'd like to make a contribution.
Style
-----

- GeoPandas supports Python 3.5+ only. The last version of GeoPandas
- GeoPandas supports Python 3.6+ only. The last version of GeoPandas
supporting Python 2 is 0.6.

- GeoPandas follows [the PEP 8
Expand Down
2 changes: 1 addition & 1 deletion README.md
@@ -1,4 +1,4 @@
GeoPandas [![build status](https://secure.travis-ci.org/geopandas/geopandas.png?branch=master)](https://travis-ci.org/geopandas/geopandas) [![Coverage Status](https://codecov.io/gh/geopandas/geopandas/branch/master/graph/badge.svg)](https://codecov.io/gh/geopandas/geopandas) [![Join the chat at https://gitter.im/geopandas/geopandas](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/geopandas/geopandas?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/geopandas/geopandas/master) [![DOI](https://zenodo.org/badge/11002815.svg)](https://zenodo.org/badge/latestdoi/11002815)
GeoPandas [![Actions Status](https://github.com/geopandas/geopandas/workflows/Tests/badge.svg)](https://github.com/geopandas/geopandas/actions?query=workflow%3ATests) [![Coverage Status](https://codecov.io/gh/geopandas/geopandas/branch/master/graph/badge.svg)](https://codecov.io/gh/geopandas/geopandas) [![Join the chat at https://gitter.im/geopandas/geopandas](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/geopandas/geopandas?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/geopandas/geopandas/master) [![DOI](https://zenodo.org/badge/11002815.svg)](https://zenodo.org/badge/latestdoi/11002815)
=========

Python tools for geographic data
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -20,7 +20,7 @@ dependencies:
- descartes
- mapclassify
- geopy
# installed in travis.yml, because not available on windows
# installed in tests.yaml, because not available on windows
# - postgis
- SQLalchemy
- psycopg2
Expand Down
File renamed without changes.
File renamed without changes.
20 changes: 8 additions & 12 deletions doc/source/community/contributing.rst
Expand Up @@ -21,11 +21,9 @@ In particular, when submitting a pull request:

- All existing tests should pass. Please make sure that the test
suite passes, both locally and on
`Travis CI <https://travis-ci.org/geopandas/geopandas>`_. Status on
Travis will be visible on a pull request. If you want to enable
Travis CI on your own fork, please read the pandas guidelines link
above or the
`getting started docs <https://docs.travis-ci.com/user/tutorial/>`_.
`GitHub Actions <hhttps://github.com/geopandas/geopandas/actions>`_. Status on
GHA will be visible on a pull request. GHA are automatically enabled
on your own fork as well. To trigger a check, make a PR to your own fork.

- New functionality should include tests. Please write reasonable
tests for your code and make sure that they pass on your pull request.
Expand All @@ -46,7 +44,7 @@ In particular, when submitting a pull request:
imports when possible, and explicit relative imports for local
imports when necessary in tests.

- GeoPandas supports Python 3.5+ only. The last version of GeoPandas
- GeoPandas supports Python 3.6+ only. The last version of GeoPandas
supporting Python 2 is 0.6.


Expand Down Expand Up @@ -109,11 +107,9 @@ want to clone your fork to your machine::
This creates the directory `geopandas-yourname` and connects your repository to
the upstream (main project) *GeoPandas* repository.

The testing suite will run automatically on Travis-CI once your pull request is
submitted. However, if you wish to run the test suite on a branch prior to
submitting the pull request, then Travis-CI needs to be hooked up to your
GitHub repository. Instructions for doing so are `here
<http://about.travis-ci.org/docs/user/getting-started/>`__.
The testing suite will run automatically on GitHub Actions once your pull request is
submitted. The test suite will also autmatically run on your branch so you can
check it prior to submitting the pull request.

Creating a branch
~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -292,7 +288,7 @@ and uses `Black <https://black.readthedocs.io/en/stable/>`_ and
`Flake8 <http://flake8.pycqa.org/en/latest/>`_ to ensure a consistent code
format throughout the project.

Continuous Integration (Travis CI) will run those tools and
Continuous Integration (GitHub Actions) will run those tools and
report any stylistic errors in your code. Therefore, it is helpful before
submitting code to run the check yourself::

Expand Down
2 changes: 0 additions & 2 deletions doc/source/getting_started/install.rst
Expand Up @@ -231,8 +231,6 @@ More specifically, whether the speedups are used or not is determined by:

.. _libspatialindex: https://github.com/libspatialindex/libspatialindex

.. _Travis CI: https://travis-ci.org/geopandas/geopandas

.. _conda: https://conda.io/en/latest/

.. _Anaconda distribution: https://www.anaconda.com/distribution/
Expand Down

0 comments on commit 7e595d0

Please sign in to comment.