Skip to content

Commit f96e0fa

Browse files
committed
Merge branch 'main' into pointx
2 parents d81f8ca + 430b65c commit f96e0fa

Some content is hidden

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

42 files changed

+568
-279
lines changed

.github/workflows/tic.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
config:
2424
# use a different tic template type if you do not want to build on all listed platforms
2525
- { os: windows-latest, r: "release" }
26-
#- { os: macOS-latest, r: "release", pkgdown: "true", latex: "true" }
26+
# - { os: macOS-latest, r: "release", pkgdown: "false", latex: "false" }
2727
- { os: ubuntu-latest, r: "devel", pkgdown: "true" }
2828
- { os: ubuntu-latest, r: "release" }
2929

@@ -44,12 +44,13 @@ jobs:
4444
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
4545

4646
steps:
47-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v3
4848

4949
- uses: r-lib/actions/setup-r@v2
5050
with:
5151
r-version: ${{ matrix.config.r }}
5252
Ncpus: 4
53+
rtools-version: '42'
5354

5455
# LaTeX. Installation time:
5556
# Linux: ~ 1 min

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: sf
2-
Version: 1.0-11
2+
Version: 1.0-13
33
Title: Simple Features for R
44
Authors@R:
55
c(person(given = "Edzer",

NAMESPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,4 +565,4 @@ importFrom(utils,str)
565565
importFrom(utils,tail)
566566
importMethodsFrom(DBI,dbDataType)
567567
importMethodsFrom(DBI,dbWriteTable)
568-
useDynLib(sf)
568+
useDynLib(sf, .registration=TRUE)

NEWS.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
# version 1.0-13
2+
3+
* `select.sf()` allows selecting the same column twice under different names; #1886
4+
5+
* `st_as_sf.ppplist()` is deprecated; #1926
6+
7+
* `st_cast()` handles empty geometries; #1961
8+
9+
* don't repeat longlat messages in `summarise.sf()`; #1519
10+
11+
* fix random sampling on the sphere; #2133
12+
13+
# version 1.0-12
14+
15+
* update NAMESPACE to `useDynLib(sf, .registration=TRUE)`; #2127 thanks to @eddelbuettel
16+
17+
* fix call in `gdal_addo()`; #2124
18+
19+
* fix issues that came up with older GDAL version, use `GDAL_VERSION_NUM` consistently; #2123 #2121 #2119
20+
121
# version 1.0-11
222

323
* `st_make_grid()` also accepts area units for `cellsize`, for square and hexagonal grids; #1505

0 commit comments

Comments
 (0)