Skip to content

Commit 9b3b687

Browse files
baagaard-usgsbaagaard-usgs
authored
Merge pull request #127 from baagaard-usgs/update-sfbay-metadata
Update SF-CVM information and update binary build settings
2 parents 087ac0e + b461a3d commit 9b3b687

Some content is hidden

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

41 files changed

+879
-826
lines changed

‎CODE_OF_CONDUCT.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Code of Conduct
22

3-
All contributions to- and interactions surrounding- this project will abide by
4-
the [USGS Code of Scientific Conduct][1].
3+
All contributions to- and interactions surrounding- this project will abide by the [USGS Code of Scientific Conduct][1].
54

65
[1]: https://www2.usgs.gov/fsp/fsp_code_of_scientific_conduct.asp

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
Contributing
22
============
33

4-
Contributions are welcome from the community. Questions can be asked
5-
on the [issues page][1]. Before creating a new issue, please take a
6-
moment to search and make sure a similar issue does not already
7-
exist. If one does exist, you can comment (most simply even with just
8-
a `:+1:`) to show your support for that issue.
4+
Contributions are welcome from the community. Questions can be asked on the [issues page][1]. Before creating a new issue, please take a moment to search and make sure a similar issue does not already exist. If one does exist, you can comment (most simply even with just a `:+1:`) to show your support for that issue.
95

10-
If you have direct contributions you would like considered for
11-
incorporation into the project you can [fork this repository][2] and
12-
[submit a pull request][3] for review.
6+
If you have direct contributions you would like considered for incorporation into the project you can [fork this repository][2] and [submit a pull request][3] for review.
137

14-
For additional information, please see the USGS software development
15-
best practices guide[4] and the USGS Code of Scientific Conduct[5].
8+
For additional information, please see the USGS software development best practices guide[4] and the USGS Code of Scientific Conduct[5].
169

1710

1811
[1]: https://github.com/baagaard-usgs/geomodelgrids/issues

‎DISCLAIMER.md‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
## Disclaimer
22

3-
This software is preliminary or provisional and is subject to revision. It is
4-
being provided to meet the need for timely best science. The software has not
5-
received final approval by the U.S. Geological Survey (USGS). No warranty,
6-
expressed or implied, is made by the USGS or the U.S. Government as to the
7-
functionality of the software and related material nor shall the fact of release
8-
constitute any such warranty. The software is provided on the condition that
9-
neither the USGS nor the U.S. Government shall be held liable for any damages
10-
resulting from the authorized or unauthorized use of the software.
3+
This software is preliminary or provisional and is subject to revision. It is being provided to meet the need for timely best science. The software has not received final approval by the U.S. Geological Survey (USGS). No warranty, expressed or implied, is made by the USGS or the U.S. Government as to the functionality of the software and related material nor shall the fact of release constitute any such warranty. The software is provided on the condition that neither the USGS nor the U.S. Government shall be held liable for any damages resulting from the authorized or unauthorized use of the software.
114

125
Any use of trade, firm, or product names is for descriptive purposes only and does not imply endorsement by the U.S. Government.

‎LICENSE.md‎

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

3-
Unless otherwise noted, this project is in the public domain in the United
4-
States because it contains materials that originally came from the United
5-
States Geological Survey, an agency of the United States Department of
6-
Interior. For more information, see the official USGS copyright policy at
7-
<https://www.usgs.gov/information-policies-and-instructions/crediting-usgs>.
3+
Unless otherwise noted, this project is in the public domain in the United States because it contains materials that originally came from the United States Geological Survey, an agency of the United States Department of Interior. For more information, see the official USGS copyright policy at <https://www.usgs.gov/information-policies-and-instructions/crediting-usgs>.
84

9-
Additionally, we waive copyright and related rights in the work
10-
worldwide through the CC0 1.0 Universal public domain dedication.
5+
Additionally, we waive copyright and related rights in the work worldwide through the CC0 1.0 Universal public domain dedication.

‎Makefile.am‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ EXTRA_DIST = \
2525
DISCLAIMER.md \
2626
LICENSE.md \
2727
setup.py \
28+
setup.cfg \
2829
code.json \
2930
developer/autopep8.cfg \
3031
developer/uncrustify.cfg \
@@ -35,14 +36,15 @@ EXTRA_DIST = \
3536
docker/debian-stable \
3637
docker/debian-testing \
3738
docker/ubuntu-20.04 \
38-
docker/ubuntu-20.10 \
3939
docker/ubuntu-21.04 \
40+
docker/ubuntu-21.10 \
4041
docker/fedora-33 \
4142
docker/fedora-34 \
43+
docker/fedora-35 \
4244
docker/centos-8 \
4345
docker/geomodelgrids-testenv \
4446
docker/geomodelgrids-devenv \
45-
docker/geomodelgrids-userenv
47+
docker/geomodelgrids-userenv \
4648
ci-config/run_tests.sh
4749

4850

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
## Description
88

9-
Georeferenced grid-based models composed of blocks with different grid resolutions.
9+
Georeferenced grid-based Earth models composed of blocks with different grid resolutions.
1010

1111
## Documentation
1212

‎code.json‎

Lines changed: 47 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,49 @@
1-
{
2-
"version": "2.0.0",
3-
"measurementType": {},
4-
"agency": "U.S. Department of Interior",
5-
"releases": [
6-
{
7-
"name": "geomodelgrids",
8-
"description": "Generate georeferenced gridded models",
9-
"version": "v1.0.0",
10-
"status": "??",
11-
"organization": "U.S. Geological Survey",
12-
"vcs": "git",
13-
"repositoryUrl": "https://github.com/baagaard-usgs/geomodelgrids.git",
14-
"homepageURL": "https://baagaard-usgs.github.io/geomodelgrids/",
15-
"downloadURL": "https://github.com/baagaard-usgs/geomodelgrids/releases/tag/v1.0.0",
16-
"disclaimerURL": "https://github.com/baagaard-usgs/geomodelgrids/blob/master/DISCLAIMER.md",
17-
"permissions": {
18-
"licenses": [
19-
{
20-
"name": "Public Domain, CC0-1.0",
21-
"URL": "https://github.com/baagaard-usgs/geomodelgrids/blob/master/LICENSE.md"
22-
}
23-
],
24-
"usageType": "openSource",
25-
"exemptionText": null
26-
},
27-
"laborHours": null,
28-
"languages": [
29-
"Python",
30-
"C++"
31-
],
32-
"tags": [
33-
"seismic velocity model",
34-
"HDF5",
35-
],
36-
"contact": {
37-
"name": "Brad Aagaard",
38-
"email": "baagaard@usgs.gov"
39-
},
40-
"date": {
41-
"metadataLastUpdated": "2019-10-24"
1+
[
2+
{
3+
"name": "geomodelgrids",
4+
"organization": "U.S. Geological Survey",
5+
"description": "Georeferenced grid-based Earth models composed of blocks with different grid resolutions.",
6+
"version": "1.0.0",
7+
"status": "Beta",
8+
9+
"permissions": {
10+
"usageType": "openSource",
11+
"licenses": [
12+
{
13+
"name": "Public Domain, CC0-1.0",
14+
"URL": "https://github.com/baagaard-usgs/geomodelgrids/blob/main/LICENSE.md"
4215
}
16+
]
17+
},
18+
19+
"homepageURL": "https://geomodelgrids.readthedocs.io",
20+
"downloadURL": "https://github.com/baagaard-usgs/geomodelgrids/archive/main.zip",
21+
"disclaimerURL": "https://github.com/baagaard-usgs/geomodelgrids/blob/main/LICENSE.md",
22+
"repositoryURL": "https://github.com/baagaard-usgs/geomodelgrids.git",
23+
"vcs": "git",
24+
25+
"laborHours": 0,
26+
27+
"tags": [
28+
"USGS",
29+
"U.S. Geological Survey",
30+
"Earth model",
31+
"seismic velocity model",
32+
"HDF5"
33+
],
34+
35+
"languages": [
36+
"Python",
37+
"C++"
38+
],
39+
40+
"contact": {
41+
"name": "Brad Aagaard",
42+
"email": "baagaard@usgs.gov"
43+
},
44+
45+
"date": {
46+
"metadataLastUpdated": "2021-10-01"
4347
}
44-
]
45-
}
48+
}
49+
]

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# ----------------------------------------------------------------------
77

88
AC_PREREQ(2.59)
9-
AC_INIT([geomodelgrids], [1.0.0rc1], [baagaard@usgs.gov])
9+
AC_INIT([geomodelgrids], [1.0.0rc2], [baagaard@usgs.gov])
1010
AC_CONFIG_HEADER([portinfo])
1111
AC_CONFIG_AUX_DIR([./aux-config])
1212
AC_CONFIG_MACRO_DIR([m4])

‎docker/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Docker images
22

3-
```
3+
```console
44
# Run in top-level source directory
5-
bash> docker build -t $TAG -f docker/$FILE .
5+
docker build -t $TAG -f docker/$FILE .
66
```
77

88
```
9-
bash> docker run --rm -it -v $TOOLS_DIR/earthvision-11:/opt/earthvision -v $HOME/data/cencal-geology:/data/cencal-geology baagaard/earthvision-env /bin/bash
9+
docker run --rm -it -v $TOOLS_DIR/earthvision-11:/opt/earthvision -v $HOME/data/cencal-geology:/data/cencal-geology baagaard/earthvision-env /bin/bash
1010
```

‎docker/build_binary.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
2. Install geomodelgrids
1313
3. Create setup.sh
1414
4. Update linking (Darwin only)
15-
4. Create tarball.
15+
5. Create tarball.
1616
"""
1717

1818
import argparse
@@ -185,7 +185,7 @@ def configure(self):
185185

186186
# --------------------------------------------------------------------------------------------------
187187
class OpenSSL(Package):
188-
VERSION = "1.1.1k"
188+
VERSION = "1.1.1l"
189189
TARBALL = f"openssl-{VERSION}.tar.gz"
190190
URL = f"https://www.openssl.org/source/{TARBALL}"
191191
SRC_DIR = f"openssl-{VERSION}"
@@ -222,7 +222,7 @@ def configure(self):
222222

223223
# --------------------------------------------------------------------------------------------------
224224
class Proj(Package):
225-
VERSION = "7.2.1"
225+
VERSION = "8.1.1"
226226
TARBALL = f"proj-{VERSION}.tar.gz"
227227
URL = f"https://download.osgeo.org/proj/{TARBALL}"
228228
BUILD_DIR = "proj-build"
@@ -248,9 +248,9 @@ def install(self):
248248

249249
# --------------------------------------------------------------------------------------------------
250250
class HDF5(Package):
251-
VERSION = "1.12.0"
251+
VERSION = "1.12.1"
252252
TARBALL = f"hdf5-{VERSION}.tar.gz"
253-
URL = f"https://hdf-wordpress-1.s3.amazonaws.com/wp-content/uploads/manual/HDF5/HDF5_1_12_0/source/{TARBALL}"
253+
URL = f"https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-{VERSION}/src/{TARBALL}"
254254
BUILD_DIR = "hdf5-build"
255255
SRC_DIR = f"hdf5-{VERSION}"
256256

0 commit comments

Comments
 (0)