Skip to content

Commit f97f888

Browse files
authored
Fab deps (#138)
* tidy up requirements * - min (available) clang tested * work without svn
1 parent 0c57612 commit f97f888

File tree

5 files changed

+12
-21
lines changed

5 files changed

+12
-21
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Please keep in sync with /environment.yml
21
name: Build
32

43
on: [push, pull_request]

dev_env.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
1-
# For creating conda environments.
2-
# Please keep in sync with .github/workflows/build.yml .
1+
# Dev env for running the example run_configs. This is Met Office oriented.
32
name: sci-fab
43
dependencies:
5-
- flake8
6-
- libclang
7-
- matplotlib
8-
- mypy
4+
- libclang>=8.0.1
95
- python>=3.8
106
- pip>=21.2.4
11-
- pytest
12-
- python-clang
13-
- pytest-cov
14-
- pytest-mock
7+
- python-clang>=8.0.1
158
- pip:
16-
- fparser
17-
- matplotlib
9+
- jinja2
1810
- psyclone==2.1.0
19-
- sphinx
20-
- sphinx_rtd_theme
2111
- svn

run_configs/readme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
These run configs live here as development aids,
22
while we develop the code and config together.
3-
They might be moved into a separate repo.
3+

run_configs/um/build_um.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ def um_atmos_safe_config(revision, two_stage=False, opt='Og'):
5555
)
5656

5757
# Locate the gcom library. UM 12.1 intended to be used with gcom 7.6
58-
gcom_build = os.getenv('GCOM_BUILD') or \
59-
os.path.expanduser(config.project_workspace / f"../gcom_object_archive_vn7.6_{compiler}/build_output")
60-
logger.info(f"expecting gcom at {gcom_build}")
58+
gcom_build = os.getenv('GCOM_BUILD') or os.path.normpath(os.path.expanduser(
59+
config.project_workspace / f"../gcom_object_archive_vn7.6_{compiler}/build_output"))
60+
if not os.path.exists(gcom_build):
61+
raise RuntimeError(f'gcom not found at {gcom_build}')
6162

6263
config.steps = [
6364

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@
4545
package_dir={'': 'source'},
4646
packages=setuptools.find_packages(where='source'),
4747
python_requires='>=3.7, <4',
48-
install_requires=['fparser', 'svn'],
48+
install_requires=['fparser'], # you'll also need python-clang if your project includes c code
4949
extras_require={
50-
'dev': ['flake8', 'mypy', 'sphinx-autodoc-typehints'],
50+
'dev': ['pytest', 'pytest-cov', 'pytest-mock', 'flake8', 'mypy', 'matplotlib',
51+
'sphinx', 'sphinx_rtd_theme', 'sphinx-autodoc-typehints'],
5152
'tests': ['pytest', 'pytest-cov', 'pytest-mock'],
5253
'docs': ['sphinx-autodoc-typehints'],
5354
}

0 commit comments

Comments
 (0)