Skip to content

Commit

Permalink
Fab deps (#138)
Browse files Browse the repository at this point in the history
* tidy up requirements

* - min (available) clang tested

* work without svn
  • Loading branch information
bblay authored Oct 24, 2022
1 parent 0c57612 commit f97f888
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 21 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Please keep in sync with /environment.yml
name: Build

on: [push, pull_request]
Expand Down
18 changes: 4 additions & 14 deletions dev_env.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
# For creating conda environments.
# Please keep in sync with .github/workflows/build.yml .
# Dev env for running the example run_configs. This is Met Office oriented.
name: sci-fab
dependencies:
- flake8
- libclang
- matplotlib
- mypy
- libclang>=8.0.1
- python>=3.8
- pip>=21.2.4
- pytest
- python-clang
- pytest-cov
- pytest-mock
- python-clang>=8.0.1
- pip:
- fparser
- matplotlib
- jinja2
- psyclone==2.1.0
- sphinx
- sphinx_rtd_theme
- svn
2 changes: 1 addition & 1 deletion run_configs/readme
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
These run configs live here as development aids,
while we develop the code and config together.
They might be moved into a separate repo.

7 changes: 4 additions & 3 deletions run_configs/um/build_um.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ def um_atmos_safe_config(revision, two_stage=False, opt='Og'):
)

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

config.steps = [

Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@
package_dir={'': 'source'},
packages=setuptools.find_packages(where='source'),
python_requires='>=3.7, <4',
install_requires=['fparser', 'svn'],
install_requires=['fparser'], # you'll also need python-clang if your project includes c code
extras_require={
'dev': ['flake8', 'mypy', 'sphinx-autodoc-typehints'],
'dev': ['pytest', 'pytest-cov', 'pytest-mock', 'flake8', 'mypy', 'matplotlib',
'sphinx', 'sphinx_rtd_theme', 'sphinx-autodoc-typehints'],
'tests': ['pytest', 'pytest-cov', 'pytest-mock'],
'docs': ['sphinx-autodoc-typehints'],
}
Expand Down

0 comments on commit f97f888

Please sign in to comment.