Merge pull request #16 from mantidproject/0-refactor-to-free-form

Refactor fortran code from fixed form to free form
mantidproject · Sep 4, 2024 · 2261116 · 2261116
2 parents dc1b59e + 468685b
commit 2261116
Show file tree

Hide file tree

Showing 24 changed files with 4,446 additions and 4,449 deletions.
diff --git a/conda/pypi-build-py310.yml b/conda/pypi-build-py310.yml
@@ -5,9 +5,9 @@ channels:
     - conda-forge
 
 dependencies:
-    - m2w64-toolchain_win-64=5.3.0  # [win]
-    - gfortran=13.2.0               # [linux]
+    - m2w64-toolchain_win-64=2.5.0  # [win]
+    - gfortran=13.2.0               # [linux or osx]
     - python=3.10.*
-    - numpy>=1.22.*
+    - numpy==2.0.*
     - pre-commit
     - pytest
diff --git a/conda/recipe/meta.yaml b/conda/recipe/meta.yaml
@@ -1,13 +1,13 @@
 {% set name = "quasielasticbayes" %}
-{% set version = "0.2.0" %}
+{% set version = "0.2.2" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
-  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.b6.tar.gz
-  sha256: 1aa89b704b0bce81749b576b633f87f1c746d05c4d54591f6f65f3ccf0b045b8
+  url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
+  sha256: 980313e642b0d5efcda7f37528d8ded2d28b577887122a9c1d4158cef61de058
 
 build:
   skip: True  # [py<310 or py>310]
@@ -17,17 +17,16 @@ build:
 
 requirements:
   build:
-    - {{ fortran_compiler }}
     - python                                 # [build_platform != target_platform]
     - cross-python_{{ target_platform }}     # [build_platform != target_platform]
     - numpy                                  # [build_platform != target_platform]
+    - {{ fortran_compiler }}
   host:
     - python
     - setuptools
     - numpy
   run:
     - python
-    - {{ pin_compatible('numpy') }}
 
 test:
   imports: