Skip to content

Commit a97d147

Browse files
committed
Merge branch 'release/ga-4.7' into develop
# Conflicts: # poetry.lock # pyproject.toml
2 parents 91c0549 + 1d678e1 commit a97d147

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ vectormath = "0.2.*"
7272

7373
## dependencies from Git repositories
7474
#------------------------------------
75-
#geoh5py = {version = ">=0.12.0b1, <0.13.dev", allow-prereleases = true}
75+
#geoh5py = {version = ">=0.12.0b5, <0.13.dev", allow-prereleases = true}
7676
geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "develop"}
7777
#geoh5py = {path = "../geoh5py", develop = true}
7878

recipe.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ context:
44
name: "mira-omf"
55
version: "0.0.0.dev0" # This will be replaced by the actual version in the build process
66
python_min: "3.10"
7+
module_name: omf
78

89
package:
910
name: ${{ name|lower }}
@@ -26,24 +27,24 @@ requirements:
2627
- pip
2728
- python 3.10.*
2829
- poetry-core >=1.8.0
29-
- poetry-dynamic-versioning >=1.9, <2.0.dev
30+
- poetry-dynamic-versioning >=1.9, 1.*
3031
- setuptools
3132
run:
3233
- python >=${{ python_min }}
3334
# Mira packages
34-
- geoh5py >=0.12.0a, <0.13.dev
35+
- geoh5py >=0.12.0b5, 0.12.*
3536
# direct dependencies
36-
- numpy >=1.26.0, <1.27.dev
37-
- properties >=0.6, <0.7.dev
37+
- numpy 1.26.*
38+
- properties 0.6.*
3839
- pypng 0.20220715.*
39-
- six >=1.16.0, <2.0.dev
40+
- six >=1.16.0, 1.*
4041
- vectormath 0.2.*
4142

4243
tests:
4344
- python:
4445
imports:
45-
- omf
46-
- omf._version
46+
- ${{ module_name }}
47+
- ${{ module_name }}._version
4748
pip_check: false # unclear why pip check reports that installed versions
4849
# of vectormath and properties are "not supported on this platform"
4950
# while they seem to work fine in the tests
@@ -56,6 +57,9 @@ tests:
5657
source:
5758
- tests/
5859
- docs/images/PointSetGeometry.png
60+
- package_contents:
61+
files:
62+
- site-packages/${{ module_name }}/_version.py
5963

6064
about:
6165
summary: API library for Open Mining Format, a new standard for mining data backed by the Global Mining Standards & Guidelines Group.
@@ -64,6 +68,7 @@ about:
6468
license: MIT
6569
license_file:
6670
- LICENSE
71+
- THIRD_PARTY_SOFTWARE.rst
6772
homepage: https://www.mirageoscience.com/mining-industry-software/python-integration/
6873
repository: https://github.com/MiraGeoscience/omf
6974

0 commit comments

Comments
 (0)