Merge pull request #735 from BCDA-APS/734-file-still-missing-from-pac…

…kage Package the aps_cycle_info.yml file
BCDA-APS · Oct 17, 2022 · c7d6700 · c7d6700
2 parents 97970d1 + 3cf1be8
commit c7d6700
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 14 deletions.
diff --git a/conda/entrypoint.sh → .conda-ignore/entrypoint.sh b/conda/entrypoint.sh → .conda-ignore/entrypoint.sh
diff --git a/conda/meta.yaml → .conda-ignore/meta.yaml b/conda/meta.yaml → .conda-ignore/meta.yaml
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -23,15 +23,25 @@ describe the future plans.
 
    release expected by 2023-01-05
 
-   1.6.7
+   1.6.8
    ******
 
    release expected by 2022-11-18
 
+1.6.7
+******
+
+release expected by 2022-10-18
+
+Fixes
+------------
+
+* [again] Make sure that YML (and other) files are packaged for pip and conda.
+
 1.6.6
 ******
 
-released by 2022-10-13
+released 2022-10-13
 
 New Features
 ------------

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,11 @@
+include LICENSE.txt
+include apstools/devices/*.db
+include apstools/devices/*.ui
+include apstools/devices/*.yml
+include apstools/migration/config
 exclude .*
-prune .github/
-prune apstools.egg-info/
 exclude conda/*
+prune .*/
+prune *.egg-info/
 prune docs/
 prune ideas/
-include apstools/devices/aps_cycle_info.yml
diff --git a/environment.yml b/environment.yml
@@ -15,13 +15,15 @@ dependencies:
   - databroker-pack
   - h5py
   - intake
+  - matplotlib-base
   - mongoquery >=1.3.6
   - openpyxl
   - ophyd >=1.6.1
   - pandas
   - pint
   - pip
   - prompt-toolkit
+  - psutil
   - pydata-sphinx-theme
   - pyEpics >=3.4.3
   - pymongo

diff --git a/requirements.txt b/requirements.txt
@@ -3,11 +3,13 @@ bluesky>=1.6.2
 databroker==1.2.5
 databroker-pack
 h5py
+matplotlib
 mongoquery>=1.3.6
 numpy
 ophyd>=1.5.1
 openpyxl
 pint
+psutil
 pyepics>=3.4.2
 pyRestTable
 spec2nexus>=2021.1.7

diff --git a/setup.cfg b/setup.cfg
@@ -89,11 +89,13 @@ install_requires =
     databroker==1.2.5
     databroker-pack
     h5py
+    matplotlib
     mongoquery>=1.3.6
     numpy
     ophyd>=1.5.1
     openpyxl
     pint
+    psutil
     pyepics>=3.4.2
     pyRestTable
     spec2nexus>=2021.1.7
@@ -110,16 +112,16 @@ dev =
 
 # Specify any package data to be included in the wheel below.
 [options.package_data]
+# Include our documentation helpers: md & rst
 apstools =
-    # Include our documentation helpers:
-    "*.rst"
-    "*.md"
-    "LICENSE.txt"
-    "CHANGES*"
-    "devices/aps_cycle_info.yml"
-    "devices/pss_shutter.db"
-    "devices/pss_shutter.ui"
-    "migration/config"
+    *.rst
+    *.md
+    LICENSE.txt
+    CHANGES*
+    devices/*.db
+    devices/*.ui
+    devices/*.yml
+    migration/config
 
 [options.entry_points]
 console_scripts =