Skip to content

Commit 328b2dc

Browse files
authored
Merge pull request #261 from xylar/update_to_v0.0.3
Update conda package to v0.0.3 for a release and build on conda-forge.
2 parents 009076a + b2d758d commit 328b2dc

File tree

6 files changed

+29
-9
lines changed

6 files changed

+29
-9
lines changed

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Copyright (c) 2013-2018, Los Alamos National Security, LLC (LANS) (Ocean: LA-CC-13-047;
1+
Copyright (c) 2013-2019, Los Alamos National Security, LLC (LANS) (Ocean: LA-CC-13-047;
22
Land Ice: LA-CC-13-117) and the University Corporation for Atmospheric Research (UCAR).
33

4-
All rights reserved.
4+
All rights reserved.
55

66
LANS is the operator of the Los Alamos National Laboratory under Contract No.
77
DE-AC52-06NA25396 with the U.S. Department of Energy. UCAR manages the National

conda_package/docs/conf.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
project = u'mpas_tools'
5353
copyright = u'This software is open source software available under the BSD-3' \
5454
u'license. Copyright (c) 2019 Triad National Security, LLC. ' \
55-
u'All rights reserved. Copyright (c) 2018 Lawrence Livermore ' \
55+
u'All rights reserved. Copyright (c) 2019 Lawrence Livermore ' \
5656
u'National Security, LLC. All rights reserved. Copyright (c) ' \
57-
u'2018 UT-Battelle, LLC. All rights reserved.'
57+
u'2019 UT-Battelle, LLC. All rights reserved.'
5858
author = u'Xylar Asay-Davis, Doug Jacobsen, Michael Duda, Mark Petersen, ' \
5959
u'Matt Hoffman, Adridan Turner, Philip Wolfram'
6060

@@ -63,9 +63,9 @@
6363
# built documents.
6464
#
6565
# The short X.Y version.
66-
version = u'0.0.2'
66+
version = '.'.join(str(vi) for vi in mpas_tools.__version_info__[0:2])
6767
# The full version, including alpha/beta/rc tags.
68-
release = u'0.0.2'
68+
release = mpas_tools.__version__
6969

7070
# The language for content autogenerated by Sphinx. Refer to documentation
7171
# for a list of supported languages.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version_info__ = (0, 0, 2)
1+
__version_info__ = (0, 0, 3)
22
__version__ = '.'.join(str(vi) for vi in __version_info__)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
channel_sources:
2+
- conda-forge,defaults
3+
4+
channel_targets:
5+
- conda-forge main
6+
7+
python:
8+
- 3.7
9+
- 3.6
10+
- 2.7

conda_package/recipe/meta.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% set name = "mpas_tools" %}
2-
{% set version = "0.0.2" %}
2+
{% set version = "0.0.3" %}
33

44
package:
55
name: '{{ name|lower }}'
@@ -26,6 +26,9 @@ requirements:
2626
- hdf5
2727
- libnetcdf
2828
- setuptools
29+
- netcdf4
30+
- openmp # [osx]
31+
2932
run:
3033
- python
3134
- netcdf4

conda_package/setup.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
#!/usr/bin/env python
22

3+
import os
4+
import re
35
from setuptools import setup, find_packages
46

5-
version = '0.0.2'
7+
here = os.path.abspath(os.path.dirname(__file__))
8+
with open(os.path.join(here, 'mpas_tools', '__init__.py')) as f:
9+
init_file = f.read()
10+
11+
version = re.search(r'{}\s*=\s*[(]([^)]*)[)]'.format('__version_info__'),
12+
init_file).group(1).replace(', ', '.')
613

714
setup(name='mpas_tools',
815
version=version,

0 commit comments

Comments
 (0)