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.

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

updated version number and fixed install problem with support for set… #5

Merged
merged 2 commits into from
Dec 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
build
*.pyc
*.so
mie/_*
*ipynb_checkpoints

*~
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ Currently, installation must be from the source code itself. Download the source

The only package dependency is ``f2py`` via ``numpy`` or ``scipy``.

Unit Tests
----------

To run the unit tests using nosetests, run the following:

$ nosetests


Authors
-------

Expand Down
4 changes: 2 additions & 2 deletions mie/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import division, absolute_import, print_function

__version__ = "0.1.0dev"
from pkg_resources import get_distribution

from .mie import *

__version__ = get_distribution('py-mie')
3 changes: 1 addition & 2 deletions mie/mie.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import numpy as np

from ._mie import dmiess_module as dmiess
Expand Down Expand Up @@ -145,7 +144,7 @@ def integrate_mode(core_fraction, n_shell, n_core, radiation_lambda,
exparg = np.log(radius / mode_radius)/np.log(mode_sigma)
dsdlogr = np.exp(-0.5*exparg**2) # m^2/m3(air)] log-normal cross section area
volwet += (4./3.)*(radius*1e-6)*dsdlogr*dlogr # [m3/m3(air)] wet volume
volcore += (4./3.)*(core_fraction**3)*(radius*1e-6)*dsdlogr*dlogr
volcore += (4./3.)*(core_fraction**3)*(radius*1e-6)*dsdlogr*dlogr

sumabs += Qabs*dsdlogr*dlogr # [m^2/m3(air)] absorption cross-section
sumsca += Qsca*dsdlogr*dlogr # [m^2/m3(air)] scattering cross-section
Expand Down
23 changes: 23 additions & 0 deletions py_mie.egg-info/PKG-INFO
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Metadata-Version: 1.1
Name: py-mie
Version: 0.4.1
Summary: Python wrapper for Mie theory calculators
Home-page: http://github.com/darothen/py-mie
Author: Daniel Rothenberg
Author-email: [email protected]
License: MIT
Download-URL: http://github.com/darothen/py-mie
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 3 - Alpha
Classifier: Environment :: Console
Classifier: Intended Audience :: Science/Research
Classifier: License :: OSI Approved :: MIT License
Classifier: Natural Language :: English
Classifier: Operating System :: Unix
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Fortran
Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
15 changes: 15 additions & 0 deletions py_mie.egg-info/SOURCES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
setup.py
mie/__init__.py
mie/mie.py
mie/mod_mie.pyf
mie/tests/__init__.py
mie/tests/test_mie_basic.py
py_mie.egg-info/PKG-INFO
py_mie.egg-info/SOURCES.txt
py_mie.egg-info/dependency_links.txt
py_mie.egg-info/requires.txt
py_mie.egg-info/top_level.txt
src/mod_bhmie.f90
src/mod_dmiess.f90
src/mod_dmilay.f90
src/mod_kinds.f90
1 change: 1 addition & 0 deletions py_mie.egg-info/dependency_links.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions py_mie.egg-info/requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
numpy
1 change: 1 addition & 0 deletions py_mie.egg-info/top_level.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mie
31 changes: 15 additions & 16 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import os
from numpy.distutils.core import setup, Extension

VERSION = '0.4.0'

src_dir = "src"
pkg_dir = "mie"

Expand All @@ -16,9 +18,6 @@
DOWNLOAD_URL = 'http://github.com/darothen/py-mie'
LICENSE = 'MIT'

#import mie
#VERSION = mie.__version__

## Setup the compiled library modules
mie_files = ["mod_%s.f90" % s for s in ["kinds", "dmiess", "bhmie", "dmilay"]]
sources = [os.path.join(src_dir, s) for s in mie_files]
Expand All @@ -29,23 +28,23 @@
)

setup(
name=NAME,
version='0.3.0',
description=DESCRIPTION,
name = NAME,
version = VERSION,
description = DESCRIPTION,
#long_description=LONG_DESCRIPTION,
author=AUTHOR,
author_email=AUTHOR_EMAIL,
maintainer=MAINTAINER,
maintainer_email=MAINTAINER_EMAIL,
url=URL,
download_url=DOWNLOAD_URL,
license=LICENSE,
author = AUTHOR,
author_email = AUTHOR_EMAIL,
maintainer = MAINTAINER,
maintainer_email = MAINTAINER_EMAIL,
url = URL,
download_url = DOWNLOAD_URL,
license = LICENSE,
#packages=['supersmoother',
# 'supersmoother.tests',
# ],
install_requires=['numpy', ],
packages=['mie','mie.tests', ],
classifiers=[
install_requires = ['numpy', ],
packages = ['mie','mie.tests', ],
classifiers = [
'Development Status :: 3 - Alpha',
'Environment :: Console',
'Intended Audience :: Science/Research',
Expand Down