Skip to content

Commit 250cc97

Browse files
baagaard-usgsbaagaard-usgs
authored
Merge pull request #89 from baagaard-usgs/update-headers
Update headers, version number, update test containers.
2 parents d8e2a6e + bddcbba commit 250cc97

File tree

260 files changed

+2444
-4228
lines changed

Some content is hidden

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

260 files changed

+2444
-4228
lines changed

‎CHANGES.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Version 3.1.0 (TBD)
1+
## Version 3.1.0 (2023/12/11)
22

33
* Add `AnalyticDB` for a spatial database composed of analytic functions.
44
* Add `CSGeoLocal` for local rotated geographic coordinate systems.

‎Makefile.am‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
# -*- Makefile -*-
1+
# =================================================================================================
2+
# This code is part of SpatialData, developed through the Computational Infrastructure
3+
# for Geodynamics (https://github.com/geodynamics/spatialdata).
24
#
3-
# ----------------------------------------------------------------------
4-
#
5-
# Brad T. Aagaard, U.S. Geological Survey
6-
#
7-
# This code was developed as part of the Computational Infrastructure
8-
# for Geodynamics (http://geodynamics.org).
9-
#
10-
# Copyright (c) 2010-2023 University of California, Davis
11-
#
12-
# See LICENSE.md for license information.
13-
#
14-
# ----------------------------------------------------------------------
5+
# Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
6+
# All rights reserved.
157
#
8+
# See https://mit-license.org/ and LICENSE.md and for license information.
9+
# =================================================================================================
1610

1711
ACLOCAL_AMFLAGS = -I m4
1812

‎applications/gensimpledb.py‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
#!/usr/bin/env nemesis
22
#
3-
# ======================================================================
3+
# =================================================================================================
4+
# This code is part of SpatialData, developed through the Computational Infrastructure
5+
# for Geodynamics (https://github.com/geodynamics/spatialdata).
46
#
5-
# Brad T. Aagaard, U.S. Geological Survey
6-
#
7-
# This code was developed as part of the Computational Infrastructure
8-
# for Geodynamics (http://geodynamics.org).
9-
#
10-
# Copyright (c) 2010-2023 University of California, Davis
11-
#
12-
# See LICENSE.md for license information.
13-
#
14-
# ======================================================================
7+
# Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
8+
# All rights reserved.
159
#
10+
# See https://mit-license.org/ and LICENSE.md and for license information.
11+
# =================================================================================================
1612
# @file spatialdata/applications/gensimpledb.py
1713
#
1814
# @brief Generic use of GenSimpleDBApp.

‎azure-pipelines.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ trigger:
44
- main
55

66
pool:
7-
vmImage: "ubuntu-20.04"
7+
vmImage: "ubuntu-22.04"
88

99
variables:
1010
IMAGE_REGISTRY: "ghcr.io/geodynamics/pylith_installer"
@@ -48,10 +48,12 @@ stages:
4848
BASE_IMAGE: "testenv-ubuntu-22.04"
4949
ubuntu_23.04:
5050
BASE_IMAGE: "testenv-ubuntu-23.04"
51-
fedora_37:
52-
BASE_IMAGE: "testenv-fedora-37"
51+
ubuntu_23.10:
52+
BASE_IMAGE: "testenv-ubuntu-23.10"
5353
fedora_38:
5454
BASE_IMAGE: "testenv-fedora-38"
55+
fedora_39:
56+
BASE_IMAGE: "testenv-fedora-39"
5557
centos_7:
5658
BASE_IMAGE: "testenv-centos-7"
5759
rockylinux_8:

‎configure.ac‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
dnl -*- autoconf -*-
1+
dnl ================================================================================================
2+
dnl This code is part of SpatialData, developed through the Computational Infrastructure
3+
dnl for Geodynamics (https://github.com/geodynamics/spatialdata).
24
dnl
3-
dnl ----------------------------------------------------------------------
4-
dnl
5-
dnl Brad T. Aagaard, U.S. Geological Survey
6-
dnl
7-
dnl This code was developed as part of the Computational Infrastructure
8-
dnl for Geodynamics (http://geodynamics.org).
9-
dnl
10-
dnl Copyright (c) 2010-2023 University of California, Davis
11-
dnl
12-
dnl See LICENSE.md for license information.
13-
dnl
14-
dnl ----------------------------------------------------------------------
5+
dnl Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
6+
dnl All rights reserved.
157
dnl
8+
dnl See https://mit-license.org/ and LICENSE.md and for license information.
9+
dnl ================================================================================================
1610

1711
AC_PREREQ(2.59)
18-
AC_INIT([spatialdata], [3.1.0dev], [[email protected]])
12+
AC_INIT([spatialdata], [3.1.0], [[email protected]])
1913
AC_CONFIG_HEADER([portinfo])
2014
AC_CONFIG_AUX_DIR([./aux-config])
2115
AC_CONFIG_MACRO_DIR([m4])

‎developer/headers.txt‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// =================================================================================================
2+
// This code is part of SpatialData, developed through the Computational Infrastructure
3+
// for Geodynamics (https://github.com/geodynamics/spatialdata).
4+
//
5+
// Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
6+
// All rights reserved.
7+
//
8+
// See https://mit-license.org/ and LICENSE.md and for license information.
9+
// =================================================================================================
10+
11+
# =================================================================================================
12+
# This code is part of SpatialData, developed through the Computational Infrastructure
13+
# for Geodynamics (https://github.com/geodynamics/spatialdata).
14+
#
15+
# Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
16+
# All rights reserved.
17+
#
18+
# See https://mit-license.org/ and LICENSE.md and for license information.
19+
# =================================================================================================
20+
21+
22+
/*
23+
* ================================================================================================
24+
* This code is part of SpatialData, developed through the Computational Infrastructure
25+
* for Geodynamics (https://github.com/geodynamics/spatialdata).
26+
*
27+
* Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
28+
* All rights reserved.
29+
*
30+
* See https://mit-license.org/ and LICENSE.md and for license information.
31+
* =================================================================================================
32+
*/
33+
34+
35+
dnl ================================================================================================
36+
dnl This code is part of SpatialData, developed through the Computational Infrastructure
37+
dnl for Geodynamics (https://github.com/geodynamics/spatialdata).
38+
dnl
39+
dnl Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
40+
dnl All rights reserved.
41+
dnl
42+
dnl See https://mit-license.org/ and LICENSE.md and for license information.
43+
dnl ================================================================================================

‎docs/Makefile.am‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
1-
# -*- Makefile -*-
1+
# =================================================================================================
2+
# This code is part of SpatialData, developed through the Computational Infrastructure
3+
# for Geodynamics (https://github.com/geodynamics/spatialdata).
24
#
3-
# ----------------------------------------------------------------------
5+
# Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
6+
# All rights reserved.
47
#
5-
# Brad T. Aagaard, U.S. Geological Survey
6-
# Charles A. Williams, GNS Science
7-
# Matthew G. Knepley, University at Buffalo
8-
#
9-
# This code was developed as part of the Computational Infrastructure
10-
# for Geodynamics (http://geodynamics.org).
11-
#
12-
# Copyright (c) 2010-2023 University of California, Davis
13-
#
14-
# See LICENSE.md for license information.
15-
#
16-
# ----------------------------------------------------------------------
8+
# See https://mit-license.org/ and LICENSE.md and for license information.
9+
# =================================================================================================
1710
#
1811

1912
dist_noinst_DATA = \

‎docs/user/coordsys.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,10 @@ cs._configure()
150150

151151
## CSGeoLocal
152152

153+
:::{note}
154+
New in v3.1.0.
155+
:::
156+
153157
`CSGeoLocal` provides the flexibility of adding a local origin and rotation to a georeferenced coordinate system.
154158
As with `CSGeo`, we use [Proj](https://proj.maptools.org) to perform georeferenced coordinate system operations, so any geographic coordinate system supported by Proj can be used.
155159
See the [Proj documentation](https://proj.org/development/reference/functions.html#c.proj_create) for more information.

‎docs/user/spatialdb/analyticdb.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# AnalyticDB
22

3+
:::{note}
4+
New in v3.1.0.
5+
:::
6+
7+
38
If the values for a field can be described by an analytic function, such as a polynomial `f(x) = a * x + b`, then you should use an `AnalyticDB`.
49
In addition to the analytical expressions for the fields, you also need to provide the name and units for each field, and the coordinate system (the default is `CSCart`).
510

‎libsrc/Makefile.am‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
# -*- Makefile -*-
1+
# =================================================================================================
2+
# This code is part of SpatialData, developed through the Computational Infrastructure
3+
# for Geodynamics (https://github.com/geodynamics/spatialdata).
24
#
3-
# ----------------------------------------------------------------------
4-
#
5-
# Brad T. Aagaard, U.S. Geological Survey
6-
#
7-
# This code was developed as part of the Computational Infrastructure
8-
# for Geodynamics (http://geodynamics.org).
9-
#
10-
# Copyright (c) 2010-2023 University of California, Davis
11-
#
12-
# See LICENSE.md for license information.
13-
#
14-
# ----------------------------------------------------------------------
5+
# Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
6+
# All rights reserved.
157
#
8+
# See https://mit-license.org/ and LICENSE.md and for license information.
9+
# =================================================================================================
1610

1711
SUBDIRS = \
1812
spatialdata

0 commit comments

Comments
 (0)