Skip to content

Commit 6cc7a33

Browse files
committed
Version 1.1.1
1 parent f92c7b6 commit 6cc7a33

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ python:
55
- "3.4"
66
- "3.5"
77
- "3.6"
8+
- "3.7"
89

910
install:
1011
- pip install -r requirements.txt

README.rst

+7-5
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,21 @@ The ``sphinx`` and ``numpy`` packages.
3939
Installation
4040
------------
4141

42-
Using ``pip``::
42+
With ``pip``::
4343

4444
pip install sphinx-fortran
4545

46+
47+
With ``conda``::
48+
49+
conda install -c vacumm -c conda-forge sphinx-fortran
50+
4651
From sources::
4752

4853
git clone https://github.com/VACUMM/sphinx-fortran.git
4954
cd sphinx-fortran
5055
python setup.py install
5156

52-
You can download sources also from the forge at IFREMER:
53-
https://forge.ifremer.fr/frs/?group_id=93
54-
5557

5658
Quick start
5759
-----------
@@ -77,7 +79,7 @@ Authors
7779

7880
Stephane Raynaud (stephane.raynaud(at)gmail.com)
7981

80-
Thanks: Thomas Gastine
82+
Thanks: Thomas Gastine and other pull request contributors.
8183

8284

8385
Documentation

setup.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Version, etc
88
sys.path.insert(0, 'sphinxfortran')
99
from sphinxfortran import ( __version__ as version, __author__ as author,
10-
__email__ as author_email)
10+
__email__ as author_email, __date__ as date)
1111
del sys.path[0]
1212

1313
# From files
@@ -25,19 +25,21 @@
2525
license = "CeCiLL-A"
2626
url = "http://sphinx-fortran.readthedocs.org"
2727
classifiers = [
28-
"License :: OSI Approved :: CEA CNRS Inria Logiciel Libre License, version 2.1 (CeCILL-2.1)",
28+
("License :: OSI Approved :: CEA CNRS Inria Logiciel "
29+
"Libre License, version 2.1 (CeCILL-2.1)"),
30+
"Topic :: Scientific/Engineering",
2931
"Programming Language :: Python :: 2.7",
3032
"Programming Language :: Python :: 3.4",
3133
"Programming Language :: Python :: 3.5",
3234
"Programming Language :: Python :: 3.6",
3335
]
3436

35-
3637
if __name__ == '__main__':
3738

3839
# Lauch setup
3940
setup(name='sphinx-fortran',
4041
version=version,
42+
date=date,
4143
description=description,
4244
long_description=long_description,
4345
author=author,

sphinxfortran/__init__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
# knowledge of the CeCILL license and that you accept its terms.
3737
#
3838

39-
__version__ = '1.1.0'
39+
__version__ = '1.1.1'
40+
__date__ = "2019-11-20"
4041
__author__ = 'Stephane Raynaud'
4142
__email__ = '[email protected]'
4243
__copyright__ = 'Copyright (c) 2010-2019 Actimar/IFREMER'

0 commit comments

Comments
 (0)