Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor fortran code from fixed form to free form #16

Merged
merged 5 commits into from
Sep 4, 2024
Merged

Refactor fortran code from fixed form to free form #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f76b92d
Convert fix format fortran to free format
robertapplin Sep 4, 2024
d9f0185
Update pypi environment to use numpy 2.0
robertapplin Sep 4, 2024
2cc3eac
Update version number in meta yaml and setup file
robertapplin Sep 4, 2024
6e856db
Add blank after STOP statement
robertapplin Sep 4, 2024
468685b
Update version number to 0.2.2
robertapplin Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions conda/pypi-build-py310.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 4 additions & 5 deletions conda/recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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:
Expand Down
Loading
Loading