Skip to content

Commit

Permalink
Merge pull request #542 from tangkong/bld_gha_migration
Browse files Browse the repository at this point in the history
DEV/BLD: GHA migration and upgrade to latest standards
  • Loading branch information
klauer authored Feb 17, 2023
2 parents e17855a + 9383ebd commit 6032b9b
Show file tree
Hide file tree
Showing 48 changed files with 509 additions and 3,121 deletions.
6 changes: 3 additions & 3 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ source =
typhos
[report]
omit =
#tests
*/tests/*
*test*
#versioning
.*version.*
*_version.py
#tests
*test*
typhos/tests/*
23 changes: 23 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[flake8]
exclude = .git,__pycache__,build,dist,typhos/_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.
4 changes: 4 additions & 0 deletions .git_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node: $Format:%H$
node-date: $Format:%cI$
describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
ref-names: $Format:%D$
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
typhos/_version.py export-subst
.git_archival.txt export-subst
24 changes: 24 additions & 0 deletions .github/workflows/standard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: PCDS Standard Testing

on:
push:
pull_request:
release:
types:
- created

jobs:
standard:
uses: pcdshub/pcds-ci-helpers/.github/workflows/python-standard.yml@master
with:
# The workflow needs to know the package name. This can be determined
# automatically if the repository name is the same as the import name.
package-name: "typhos"
# Extras that will be installed for both conda/pip:
testing-extras: "happi"
# Extras to be installed only for conda-based testing:
conda-testing-extras: "pcdsdevices pyqt=5"
# Extras to be installed only for pip-based testing:
pip-testing-extras: "PyQt5<5.15"
# Set if using setuptools-scm for the conda-build workflow
use-setuptools-scm: true
17 changes: 8 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
exclude: |
(?x)^(
versioneer.py|
docs/source/conf.py|
typhos/_version.py|
)$
(?x)^(
typhos/_version.py|
)$
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
rev: v4.4.0
hooks:
- id: no-commit-to-branch
- id: trailing-whitespace
Expand All @@ -23,12 +22,12 @@ repos:
exclude: '^(conda-recipe/meta.yaml)$'
- id: debug-statements

- repo: https://github.com/pycqa/flake8
rev: 3.9.2
- repo: https://github.com/pycqa/flake8.git
rev: 6.0.0
hooks:
- id: flake8

- repo: https://github.com/timothycrosley/isort
rev: 5.10.1
rev: 5.11.5
hooks:
- id: isort
23 changes: 0 additions & 23 deletions .travis.yml

This file was deleted.

13 changes: 13 additions & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
=======
Credits
=======

Maintainer
----------

* SLAC National Accelerator Laboratory <>

Contributors
------------

Interested? See: `CONTRIBUTING.rst <CONTRIBUTING.rst>`_
103 changes: 103 additions & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -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/typhos/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
~~~~~~~~~~~~~~~~~~~

typhos could always use more documentation, whether
as part of the official typhos 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/typhos/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 `typhos` for local development.

1. Fork the `typhos` repo on GitHub.
2. Clone your fork locally::

$ git clone git@github.com:your_name_here/typhos.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 typhos python=3.9 pip
$ cd typhos/
$ 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.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2016, 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
Expand Down
2 changes: 0 additions & 2 deletions conda-recipe/build.sh

This file was deleted.

102 changes: 65 additions & 37 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,60 +1,88 @@
{% set data = load_setup_py_data() %}
{% set package_name = "typhos" %}
{% set import_name = "typhos" %}
{% set version = load_file_regex(load_file=os.path.join(import_name, "_version.py"), regex_pattern=".*version = '(\S+)'").group(1) %}

package:
name : typhos
version : {{ data.get('version') }}
name: {{ package_name }}
version: {{ version }}

source:
path: ..
path: ..

build:
number: 0
noarch: python
entry_points:
- typhos = typhos.cli:main
script: {{ PYTHON }} -m pip install . -vv



requirements:
build:
- python >=3.9
- pip
- setuptools_scm
host:
- python >=3.7
- pip
- python >=3.9
- pip
run:
- python >=3.7
- coloredlogs
- entrypoints
- numpy
- numpydoc
- ophyd >=1.5.0
- pcdsutils
- pydm >=1.16.1
- pyqt >=5,<5.15
- pyqtgraph
- qdarkstyle
- qtawesome
- qtconsole
- qtpy
- timechart >=1.2.4
- python >=3.9
- coloredlogs
- entrypoints
- numpy
- numpydoc
- ophyd >=1.5.0
- pcdsdevices
- pcdsutils
- pydm >=1.16.1
- pyqt
- pyqtgraph
- qdarkstyle
- qtawesome
- qtconsole
- qtpy
- timechart >=1.2.4
run_constrained:
- happi >=1.14.0
- jupyter_client <7.3.2
- happi >=1.14.0
- jupyter_client <7.3.2



test:
commands:
- typhos --help
imports:
- typhos
- typhos.cli
requires:
- caproto
- doctr
- doctr-versions-menu
- flake8
- ipython>=7.16
- jinja2<3.1
- line_profiler <4.0.0
- pytest
- pytest-benchmark
- pytest-qt
- pytest-timeout
- simplejson



about:
home: https://github.com/pcdshub/typhos
doc_url: https://pcdshub.github.io/typhos
dev_url: https://github.com/pcdshub/typhos
summary: 'Automatic-yet-customizable Graphical User Interface Generation for Ophyd Devices'
doc_url: https://pcdshub.github.io/typhos
home: https://github.com/pcdshub/typhos
license: SLAC Open
license_family: OTHER
license_file: LICENSE.md
summary: Automatic-yet-customizable Graphical User Interface Generation for Ophyd
Devices


test:
imports:
- typhos
- typhos.cli
commands:
- typhos --help

extra:
recipe-maintainers:
- klauer
- hhslepicka
- zllentz
- klauer
- tangkong
- zllentz
4 changes: 0 additions & 4 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
caproto
doctr
doctr-versions-menu
flake8
ipython>=7.16
jinja2<3.1
Expand All @@ -9,6 +7,4 @@ pytest
pytest-benchmark
pytest-qt
pytest-timeout
sphinx<4.0.0
sphinx_rtd_theme
simplejson
Loading

0 comments on commit 6032b9b

Please sign in to comment.