Skip to content

Commit

Permalink
FIX: Fixes install issues for conda-forge. Namespace was being used (A…
Browse files Browse the repository at this point in the history
…RM-DOE#585)

incorrectly.
  • Loading branch information
zssherman authored Dec 1, 2022
1 parent 940e24c commit 92f4970
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
10 changes: 4 additions & 6 deletions act/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
# No more pandas warnings
from pandas.plotting import register_matplotlib_converters

from . import tests
from ._version import get_versions

register_matplotlib_converters()

# Import early so these classes are available to the object
from .qc import QCFilter, QCTests, clean

# Import the lazy loaded modules
submodules = [
'corrections',
Expand All @@ -23,14 +25,10 @@
'utils',
'retrievals',
'plotting',
'tests',
]
__getattr__, __dir__, _ = lazy.attach(__name__, submodules)

# Import early so these classes are available to the object
from act.qc.qcfilter import QCFilter
from act.qc.qctests import QCTests
from act.qc import clean

# Version for source builds
vdict = get_versions()
__version__ = vdict['version']
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from os import path
from setuptools import setup, find_namespace_packages
from setuptools import setup, find_packages
import sys
import versioneer

Expand Down Expand Up @@ -46,7 +46,7 @@
author='Adam Theisen',
author_email='[email protected]',
url='https://github.com/ARM-DOE/ACT',
packages=find_namespace_packages(include=['act'], exclude=['docs']),
packages=find_packages(exclude=['docs']),
entry_points={'console_scripts': []},
include_package_data=True,
package_data={'act': []},
Expand Down

0 comments on commit 92f4970

Please sign in to comment.