Skip to content

Commit ce9bc42

Browse files
authored
Merge pull request #106 from MiraGeoscience/hotfix/0.1.3
merge hotfix/0.1.3 to main
2 parents b97883e + 6c6a2b1 commit ce9bc42

Some content is hidden

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

48 files changed

+3782
-1349
lines changed

.github/workflows/pytest-unix-os.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ name: pytest on Unix OS
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- main
77
- release/**
8-
- feature/**
98
- hotfix/**
109
push:
1110
branches:
12-
- development
13-
- master
11+
- develop
12+
- main
1413
- release/**
1514
- feature/**
1615
- hotfix/**

.github/workflows/pytest-windows.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@ name: pytest on Windows
22

33
on:
44
pull_request:
5+
branches:
6+
- develop
7+
- main
8+
- release/**
9+
- feature/**
10+
- hotfix/**
511
push:
612
branches:
7-
- development
8-
- master
13+
- develop
14+
- main
915
- release/**
1016
- feature/**
1117
- hotfix/**

.github/workflows/static-analysis.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,18 @@ name: static analysis
33
on:
44
pull_request:
55
branches:
6-
- development
7-
- master
6+
- develop
7+
- main
8+
- release/**
9+
- feature/**
10+
- hotfix/**
811
push:
912
branches:
10-
- development
11-
- master
13+
- develop
14+
- main
15+
- release/**
16+
- feature/**
17+
- hotfix/**
1218

1319
jobs:
1420
pre-commit:

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ repos:
6161
- id: trailing-whitespace
6262
exclude: \.mdj$
6363
- id: check-toml
64+
- id: check-yaml
6465
# - id: check-added-large-files # crashing on some configuration. To be investigated
6566
- id: check-case-conflict
6667
- id: check-merge-conflict

.rstcheck.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[rstcheck]
22
ignore_directives=automodule
3+
report=warning

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Install **geoh5py** from PyPI::
3333

3434
Setup for development
3535
^^^^^^^^^^^^^^^^^^^^^
36-
After having cloned the Git repository you will need to setup `Poetry`_.
36+
After having cloned the Git repository you will need to set up `Poetry`_.
3737
`Poetry`_ makes it easy to install the dependencies and start a virtual environment.
3838

3939
To install poetry:
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
2+
.. _primitive_type:
3+
4+
Primitive Types
5+
===============
6+
7+
*To be further documented*
8+
9+
Float
10+
^^^^^
11+
12+
- Stored as a 1D array of 32-bit float type
13+
- No data value: 1.175494351e-38 (FLT_MIN, considering use of NaN)
14+
15+
Integer
16+
^^^^^^^
17+
18+
- Stored as a 1D array of 32-bit integer type
19+
- No data value: –2147483648 (INT_MIN, considering use of NaN)
20+
21+
Text
22+
^^^^
23+
24+
- Stored as a 1D array of UTF-8 encoded, variable-length string type
25+
- No data value : empty string
26+
27+
Referenced
28+
^^^^^^^^^^
29+
30+
- Stored as a 1D array of 32-bit unsigned integer type (native)
31+
- Value map : (1D composite type array dataset - Key (unsigned int),
32+
Value (variable-length utf8 string) ) must exist under type
33+
- No data value : 0 (key is tied to value “Unknown”)
34+
35+
DateTime
36+
^^^^^^^^
37+
38+
- Stored as a 1D array of variable-length strings formatted according
39+
to the `ISO 8601 <https://en.wikipedia.org/wiki/ISO_8601>`__ extended
40+
specification for representations of UTC dates and times (Qt
41+
implementation), taking the form YYYY-MM-DDTHH:mm:ss[Z|[+|-]HH:mm]
42+
- No data value : empty string
43+
44+
Filename
45+
^^^^^^^^
46+
47+
- Stored as a 1D array of UTF-8 encoded, variable-length string type
48+
designating a file name
49+
- For each file name within “Data”, an opaque dataset named after the
50+
filename must be added under the Data instance, containing a complete
51+
binary dump of the file
52+
- Different files (under the same object/group) must be saved under
53+
different names
54+
- No data value : empty string
55+
56+
Blob
57+
^^^^
58+
59+
- Stored as a 1D array of 8-bit char type (native) (value ‘0’ or ‘1’)
60+
- For each index set to 1, an opaque dataset named after the index
61+
(e.g. “1”, “2”, etc) must be added under the Data instance,
62+
containing the binary data tied to that index
63+
- No data value : 0
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
.. _ga_group_types:
2+
3+
Group Types
4+
***********
5+
6+
*To be further documented*
7+
8+
Container
9+
=========
10+
11+
**UUID : {61FBB4E8-A480-11E3-8D5A-2776BDF4F982}**
12+
13+
Simple container with no special meaning. Default in Geoscience ANALYST.
14+
15+
16+
Drillholes
17+
==========
18+
19+
**UUID : {825424FB-C2C6-4FEA-9F2B-6CD00023D393}**
20+
21+
Container restricted to containing drillhole objects, and which may
22+
provide convenience functionality for the drillholes within.
23+
24+
25+
No Type (Root)
26+
==============
27+
28+
**UUID : {dd99b610-be92-48c0-873c-5b5946ea2840}**
29+
30+
The ``Root`` group defines the tree structure used in Geoscience ANALYST
31+
describing the parent-child relationships of entities. If absent, any Groups/Objects/Data
32+
will be brought into Geoscience ANALYST under the workspace group, still respecting any defined hierarchy links.
33+
34+
35+
Tools
36+
=====
37+
38+
**UUID : {a2befc38-3207-46aa-95a2-16b40117a5d8}**
39+
40+
Group for slicer and label objects.
41+
42+
*Not yet geoh5py implemented*
43+
44+
*To be further documented*
45+
46+
Maxwell
47+
=======
48+
49+
**UUID : {1c4122b2-8e7a-4ec3-8d6e-c818495adac7}**
50+
51+
Group for Maxwell plate modeling application.
52+
53+
*Not yet geoh5py implemented*
54+
55+
*To be further documented*

0 commit comments

Comments
 (0)