Skip to content

Commit c88e2a4

Browse files
committed
Merge branch 'main' into FEAT_add_etopo1
2 parents 16d7d95 + a6c0835 commit c88e2a4

File tree

211 files changed

+4462
-2158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+4462
-2158
lines changed

.appveyor.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

.circleci/config.yml

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,57 +12,21 @@ version: 2.1
1212
apt-run: &apt-install
1313
name: Install apt packages
1414
command: |
15-
apt-get -qq update
16-
apt-get install -y \
15+
sudo apt -qq update
16+
sudo apt install -y \
1717
gcc \
1818
g++ \
1919
make
2020
21-
env-run: &env-setup
22-
# Create the basic testing environment
23-
# Mixing conda-forge and defaults in root is a recipe for trouble, so create
24-
# a separate environment.
25-
name: Setup conda environment
26-
command: |
27-
conda config \
28-
--set always_yes yes \
29-
--set changeps1 no \
30-
--set show_channel_urls yes
31-
conda config --add channels conda-forge
32-
conda create -n test-environment python=$PYTHON_VERSION
33-
34-
deps-run: &deps-install
35-
name: Install Python dependencies
36-
command: |
37-
conda install -n test-environment --quiet \
38-
cython \
39-
'matplotlib>3.3' \
40-
numpy \
41-
owslib \
42-
pillow \
43-
pyproj \
44-
pykdtree \
45-
pyshp \
46-
requests \
47-
scipy \
48-
setuptools_scm \
49-
setuptools_scm_git_archive \
50-
shapely \
51-
$EXTRA_PACKAGES \
52-
--file docs/doc-requirements.txt
53-
conda list -n test-environment
54-
5521
cp-run: &cp-install
5622
name: Install Cartopy
5723
command: |
58-
source activate test-environment
59-
pip install -ve .
24+
python -m pip install --upgrade --user pip
25+
python -m pip install --user -ve .[doc,ows,plotting,speedups]
6026
6127
doc-run: &doc-build
6228
name: Build documentation
6329
command: |
64-
source activate test-environment
65-
PYPROJ_GLOBAL_CONTEXT=ON
6630
make -C docs html
6731
6832
@@ -73,16 +37,11 @@ doc-run: &doc-build
7337
jobs:
7438
docs-python3:
7539
docker:
76-
- image: continuumio/miniconda3:latest
40+
- image: cimg/python:3.11
7741
steps:
7842
- checkout
7943

8044
- run: *apt-install
81-
- run:
82-
<<: *env-setup
83-
environment:
84-
PYTHON_VERSION: 3
85-
- run: *deps-install
8645
- run: *cp-install
8746

8847
- run: *doc-build

.coveragerc

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,12 @@
44

55
[run]
66
branch = True
7-
omit =
8-
lib/cartopy/examples/*
9-
lib/cartopy/sphinxext/*
7+
omit =
108
lib/cartopy/tests/*
119
lib/cartopy/_version.py
1210
*.pxd
1311
plugins = Cython.Coverage
1412

15-
[paths]
16-
source =
17-
lib/cartopy
18-
/home/travis/miniconda/envs/test-environment/lib/python?.?/site-packages/cartopy
19-
2013
[report]
2114
exclude_lines =
2215
pragma: no cover

.git-blame-ignore-revs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# style: start of pre-commit and whitespace fixes
2+
16aba40dd09fb95c85fac1a0bee0f795b9f8b5fe
3+
4+
# format: spell checking (#2153)
5+
eb1dd508e087396948de5a3d20c5791500743ddf
6+
7+
# style: sort __all__ statements (#2151)
8+
c00e0adae1b1e8695e173f4482369face82206ee
9+
10+
# style: adopt isort to enforce import ordering (#2150)
11+
030a78b0f5cd6a88b04dd2fbe78f12b4b3e5e60d

.git_archival.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Getting started
1616
1. Fork the Cartopy repository, create your new fix/feature branch, and
1717
start committing code. We broadly follow the [gitwash guidelines](https://matthew-brett.github.io/pydagogue/gitwash/git_development.html).
1818
1. Remember to add appropriate documentation and tests to supplement any new or changed functionality.
19-
1. If you're not already on it (and would like to be), please add yourself to the
19+
1. If you're not already on it (and would like to be), please add yourself to the
2020
contributors list (docs/source/contributors.rst)
2121

2222

@@ -29,4 +29,3 @@ Submitting changes
2929
1. Push your branch to your fork of cartopy.
3030
1. Submit your pull request.
3131
1. Sit back and wait for the core Cartopy development team to review your code.
32-

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ questions on StackOverflow can be found at https://stackoverflow.com/questions/t
1717
1818
```
1919

20-
#### Traceback
20+
#### Traceback
2121

2222
```
2323

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ request could be broken into smaller parts before submitting.
2929
* If this is a new feature, please provide an example of its use in the description. We may want to make a
3030
follow-on pull request to put the example in the gallery!
3131
32-
* Ensure there is a suitable item in the cartopy test suite for the change you are proposing.
32+
* Ensure there is a suitable item in the cartopy test suite for the change you are proposing.
3333
3434
-->

.github/SUPPORT.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
* Ask usage questions on [StackOverflow](https://stackoverflow.com/questions/tagged/cartopy).
2-
* For less well defined questions, ideas, general discussion or announcements of related projects use the [Google Group](https://groups.google.com/forum/#!forum/scitools-iris).
2+
* For less well defined questions, ideas, general discussion or announcements of related projects use the
3+
[Cartopy category on Matplotlib's Discourse](https://discourse.matplotlib.org/c/3rdparty/cartopy/19).
34
* Report bugs, suggest features or view the source code on [GitHub](https://github.com/SciTools/cartopy).
5+
* To chat with developers and other users you can use the [Gitter Chat](https://gitter.im/SciTools/cartopy).

.github/dependabot.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Reference:
2+
# - https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/keeping-your-actions-up-to-date-with-dependabot
3+
# - https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
4+
5+
version: 2
6+
updates:
7+
8+
- package-ecosystem: "github-actions"
9+
directory: "/"
10+
schedule:
11+
# Check for updates to GitHub Actions every weekday
12+
interval: "daily"
13+
labels:
14+
- "🤖 Bot"

0 commit comments

Comments
 (0)