Merge pull request #115 from klauer/ci_migrate_gha_2

DEV/MNT: migrate to latest standards with pyproject.toml [LCLSPC-603]

.coveragerc

@@ -3,11 +3,10 @@ source =
     pcdsdaq
 [report]
 omit =
-    #tests
-    */tests/*
-    *test*
     #versioning
     .*version.*
     *_version.py
-    #sim
+    #tests
+    *test*
+    pcdsdaq/tests/*
     pcdsdaq/sim/*

.flake8

@@ -0,0 +1,23 @@
+[flake8]
+exclude = .git,__pycache__,build,dist,pcdsdaq/_version.py
+max-line-length = 88
+select = C,E,F,W,B,B950
+extend-ignore = E203, E501, E226, W503, W504
+
+# Explanation section:
+# B950
+#   This takes into account max-line-length but only triggers when the value
+#   has been exceeded by more than 10% (96 characters).
+# E203: Whitespace before ':'
+#   This is recommended by black in relation to slice formatting.
+# E501: Line too long (82 > 79 characters)
+#   Our line length limit is 88 (above 79 defined in E501).  Ignore it.
+# E226: Missing whitespace around arithmetic operator
+#   This is a stylistic choice which you'll find everywhere in pcdsdevices, for
+#   example.  Formulas can be easier to read when operators and operands
+#   have no whitespace between them.
+#
+# W503: Line break occurred before a binary operator
+# W504: Line break occurred after a binary operator
+#   flake8 wants us to choose one of the above two.  Our choice
+#   is to make no decision.

.git_archival.txt

@@ -0,0 +1,4 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
+ref-names: $Format:%D$

.gitattributes

@@ -1 +1 @@
-pcdsdaq/_version.py export-subst
+.git_archival.txt  export-subst

.pre-commit-config.yaml

@@ -1,8 +1,13 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+exclude: |
+  (?x)^(
+    pcdsdaq/_version.py|
+  )$
+
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
+    rev: v4.4.0
     hooks:
     -   id: no-commit-to-branch
     -   id: trailing-whitespace
@@ -17,12 +22,12 @@ repos:
         exclude: '^(conda-recipe/meta.yaml)$'
     -   id: debug-statements
 
--   repo: https://gitlab.com/pycqa/flake8.git
-    rev: 3.8.3
+-   repo: https://github.com/pycqa/flake8.git
+    rev: 6.0.0
     hooks:
     -   id: flake8
 
 -   repo: https://github.com/timothycrosley/isort
-    rev: 5.5.2
+    rev: 5.12.0
     hooks:
     -   id: isort

AUTHORS.rst

@@ -0,0 +1,13 @@
+=======
+Credits
+=======
+
+Maintainer
+----------
+
+* SLAC National Accelerator Laboratory <>
+
+Contributors
+------------
+
+Interested? See: `CONTRIBUTING.rst <CONTRIBUTING.rst>`_

CONTRIBUTING.rst

@@ -0,0 +1,103 @@
+============
+Contributing
+============
+
+Contributions are welcome, and they are greatly appreciated! Every little bit
+helps, and credit will always be given.
+
+You can contribute in many ways:
+
+Types of Contributions
+----------------------
+
+Report Bugs
+~~~~~~~~~~~
+
+Report bugs at https://github.com/pcdshub/pcdsdaq/issues.
+
+If you are reporting a bug, please include:
+
+* Any details about your local setup that might be helpful in troubleshooting.
+* Detailed steps to reproduce the bug.
+
+Fix Bugs
+~~~~~~~~
+
+Look through the GitHub issues for bugs. Anything tagged with "bug"
+is open to whoever wants to implement it.
+
+Implement Features
+~~~~~~~~~~~~~~~~~~
+
+Look through the GitHub issues for features. Anything tagged with "feature"
+is open to whoever wants to implement it.
+
+Write Documentation
+~~~~~~~~~~~~~~~~~~~
+
+pcdsdaq could always use more documentation, whether
+as part of the official pcdsdaq docs, in docstrings,
+or even on the web in blog posts, articles, and such.
+
+Submit Feedback
+~~~~~~~~~~~~~~~
+
+The best way to send feedback is to file an issue at https://github.com/pcdshub/pcdsdaq/issues.
+
+If you are proposing a feature:
+
+* Explain in detail how it would work.
+* Keep the scope as narrow as possible, to make it easier to implement.
+* Remember that this is a volunteer-driven project, and that contributions
+  are welcome :)
+
+Get Started!
+------------
+
+Ready to contribute? Here's how to set up `pcdsdaq` for local development.
+
+1. Fork the `pcdsdaq` repo on GitHub.
+2. Clone your fork locally::
+
+    $ git clone [email protected]:your_name_here/pcdsdaq.git
+
+3. Install your local copy into a new conda environment. Assuming you have conda installed, this is how you set up your fork for local development::
+
+    $ conda create -n pcdsdaq python=3.9 pip
+    $ cd pcdsdaq/
+    $ pip install -e .
+
+4. Create a branch for local development::
+
+    $ git checkout -b name-of-your-bugfix-or-feature
+
+   Now you can make your changes locally.
+
+5. Install and enable ``pre-commit`` for this repository::
+
+    $ pip install pre-commit
+    $ pre-commit install
+
+6. Add new tests for any additional functionality or bugs you may have discovered.  And, of course, be sure that all previous tests still pass by running::
+
+    $ pytest -v
+
+7. Commit your changes and push your branch to GitHub::
+
+    $ git add .
+    $ git commit -m "Your detailed description of your changes."
+    $ git push origin name-of-your-bugfix-or-feature
+
+8. Submit a pull request through the GitHub website.
+
+Pull Request Guidelines
+-----------------------
+
+Before you submit a pull request, check that it meets these guidelines:
+
+1. The pull request should include tests.
+2. If the pull request adds functionality, the docs should be updated. Put your
+   new functionality into a function with a docstring, and add the feature to
+   the list in README.rst.
+3. The pull request should work for Python 3.9 and up. Check the GitHub Actions status
+   and make sure that the tests pass for all supported Python versions.

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2018, The Board of Trustees of the Leland Stanford Junior
+Copyright (c) 2023, The Board of Trustees of the Leland Stanford Junior
 University, through SLAC National Accelerator Laboratory (subject to receipt
 of any required approvals from the U.S. Dept. of Energy). All rights reserved.
 Redistribution and use in source and binary forms, with or without

conda-recipe/meta.yaml

@@ -1,31 +1,38 @@
-{% set data = load_setup_py_data() %}
+{% set package_name = "pcdsdaq" %}
+{% set import_name = "pcdsdaq" %}
+{% set version = load_file_regex(load_file=os.path.join(import_name, "_version.py"), regex_pattern=".*version = '(\S+)'").group(1) %}
 
 package:
-  name: pcdsdaq
-  version : {{ data.get('version') }}
+  name: {{ package_name }}
+  version: {{ version }}
 
 source:
   path: ..
 
 build:
   number: 0
   noarch: python
+  script: {{ PYTHON }} -m pip install . -vv
 
 requirements:
   build:
-    - python >=3.9
-    - setuptools
+  - python >=3.9
+  - setuptools_scm
+  - pip
   run:
-    - python >=3.6
-    - bluesky >=1.6.0
-    - ophyd >=1.5.0
-    - pcdsdevices >=2.1.0
-    - psdaq-control-minimal >=3.3.19
-    - toolz
+  - python >=3.9
+  - bluesky >=1.6.0
+  - ophyd >=1.5.0
+  - pcdsdevices >=2.1.0
+  - psdaq-control-minimal >=3.3.19
+  - toolz
 
 test:
   imports:
-    - pcdsdaq
+  - pcdsdaq
+  requires:
+  - pytest
+  - pytest-timeout
 
 about:
   home: https://github.com/pcdshub/pcdsdaq

dev-requirements.txt

@@ -1,3 +1,2 @@
 pytest
 pytest-timeout
-flake8

docs-requirements.txt

@@ -1,3 +1,4 @@
-doctr
+docs-versions-menu
 sphinx
 sphinx_rtd_theme
+sphinxcontrib-jquery