Merge branch 'main' of github.com:ARM-DOE/ACT into plot_v2

.coveragerc

@@ -4,4 +4,3 @@ omit =
     act/*version*py
     versioneer.py
     setup.py
-

.github/workflows/python-package-conda.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         os: [macOS, ubuntu, Windows]
         inlcude:
           - os: macos-latest
@@ -43,7 +43,7 @@ jobs:
       - name: Setup Conda Environment
         uses: mamba-org/setup-micromamba@v1
         with:
-          python-version: ${{ matrix.python-version }}
+          create-args: python=${{ matrix.python-version }}
           environment-file: ./continuous_integration/environment_actions.yml
           environment-name: act_env
 

CONTRIBUTING.rst

@@ -198,7 +198,7 @@ An example:
 
 .. code-block:: python
 
-    def read_netcdf(filenames, variables=None):
+    def read_arm_netcdf(filenames, variables=None):
 
         """
         Returns `xarray.Dataset` with stored data and metadata from a
@@ -226,7 +226,7 @@ An example:
 
             import act
 
-            the_ds, the_flag = act.io.armfiles.read_netcdf(
+            the_ds, the_flag = act.io.arm.read_arm_netcdf(
                 act.tests.sample_files.EXAMPLE_SONDE_WILDCARD)
             print(the_ds.act.datastream)
         """
@@ -278,6 +278,18 @@ the tools documentation for details on this process.
 - https://flake8.pycqa.org/en/latest/
 - https://www.pylint.org/
 
+Naming Convenction
+----------------------------------------
+
+Discovery
+~~~~~~~~~
+When adding discovery modules or functions please adhere to the following
+* Filenames should just include the name of the organization (arm) or portal (airnow) and no other filler words like get or download
+* Functions should follow [get/download]_[org/portal]_[data/other description].  If it is getting data but not downloading a file, it should start with get, like get_asos_data. If it downloads a file, it should start with download.  The other description can vary depending on what you are retrieving.  Please check out the existing functions for ideas.
+
+Discovery
+~~~~~~~~~
+Similarly, for the io modules, the names should not have filler and just be the organization or portal name.  The functions should clearly indicate what it is doing like read_arm_netcdf instead of read_netcdf if the function is specific to ARM files.
 
 Adding Secrets and Environment Variables
 ----------------------------------------

README.rst

@@ -110,7 +110,7 @@ environment based on the `environment.yml <https://github.com/ARM-DOE/ACT/blob/m
 
 Or for a basic environment and downloading optional dependencies as needed::
 
-    conda create -n act_env -c conda-forge python=3.11 act-atmos
+    conda create -n act_env -c conda-forge python=3.12 act-atmos
 
 Basic command in a terminal or command prompt to install the latest version of
 ACT::

act/discovery/__init__.py

@@ -8,15 +8,14 @@
 
 __getattr__, __dir__, __all__ = lazy.attach(
     __name__,
-    submodules=['get_armfiles', 'get_cropscape', 'get_airnow', 'get_noaapsl', 'get_neon', 'get_surfrad'],
+    submodules=['arm', 'cropscape', 'airnow', 'noaapsl', 'neon', 'surfrad'],
     submod_attrs={
-        'get_arm': ['download_arm_data'],
-        'get_armfiles': ['download_data', 'download_arm_data', 'get_arm_doi'],
-        'get_asos': ['get_asos'],
-        'get_airnow': ['get_airnow_bounded_obs', 'get_airnow_obs', 'get_airnow_forecast'],
-        'get_cropscape': ['croptype'],
-        'get_noaapsl': ['download_noaa_psl_data'],
-        'get_neon': ['get_site_products', 'get_product_avail', 'download_neon_data'],
-        'get_surfrad': ['download_surfrad']
+        'arm': ['download_arm_data', 'get_arm_doi'],
+        'asos': ['get_asos_data'],
+        'airnow': ['get_airnow_bounded_obs', 'get_airnow_obs', 'get_airnow_forecast'],
+        'cropscape': ['get_crop_type'],
+        'noaapsl': ['download_noaa_psl_data'],
+        'neon': ['get_neon_site_products', 'get_neon_product_avail', 'download_neon_data'],
+        'surfrad': ['download_surfrad_data']
     },
 )