Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v0.3.1 #295

Merged
merged 167 commits into from
May 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
b3e6432
Created hwp rotation agent
chill90 Apr 30, 2021
8aa9b4d
Updates from comments
chill90 Jan 26, 2022
c30fffe
Added hwp_rotation dependencies
chill90 Jan 27, 2022
47b5db9
Add mysql-connector to install_requires
BrianJKoopman Feb 16, 2022
4ceba65
Make vantage_pro2 directory importable
BrianJKoopman Feb 16, 2022
aa9f043
Add so3g as optional requirement
BrianJKoopman Feb 16, 2022
4bd1963
Add build and test wheel job to develop workflow
BrianJKoopman Feb 16, 2022
5233b0e
Fix npy extension issue
jlashner Feb 15, 2022
40a82e8
Tested on k2so
simonscryo Feb 16, 2022
7e16f2f
Merge pull request #257 from simonsobs/koopman/fix-wheel-builds
BrianJKoopman Feb 23, 2022
1a9484d
pip install directly from socs repo
BrianJKoopman Feb 23, 2022
779879f
Created pfeiffer turbo controller agent (#149)
JakeSpisak Feb 23, 2022
4813539
add capability to input config file for LS372 channel settings
sanahabhimani Mar 7, 2022
27e19d7
get rid of lines that make the input configfile method an OCS task
sanahabhimani Mar 7, 2022
c1b3912
Small bugfix for pysmurf monitor
simonscryo Mar 16, 2022
7400ffe
update agent to follow the path where 372 config files live
sanahabhimani Mar 16, 2022
e8f0151
add more commands to 372 agent using specs from configfile
sanahabhimani Mar 17, 2022
a3bdbf6
Specify location to clone repo to for consistency
BrianJKoopman Mar 17, 2022
4289be8
Merge pull request #258 from simonsobs/koopman/fix-pysmurf-controller…
BrianJKoopman Mar 17, 2022
44b8f3a
Run apt-get update before package installation
BrianJKoopman Mar 18, 2022
58e8bd4
Test docker image builds on PRs
BrianJKoopman Mar 18, 2022
a61c52b
Fix similar apt-get update issue in suprsync agent
BrianJKoopman Mar 18, 2022
0a1b222
Merge pull request #265 from simonsobs/koopman/fix-archiver-docker-build
BrianJKoopman Mar 18, 2022
f327d60
Merge branch 'develop' of https://github.com/simonsobs/socs into ls37…
sanahabhimani Mar 21, 2022
983edfd
clean up 372 commands and print statements
sanahabhimani Mar 21, 2022
21a056e
fix typo in print statement for excitation value
sanahabhimani Mar 21, 2022
5660052
Merge pull request #263 from simonsobs/pysmurf-monitor-bugfix
BrianJKoopman Mar 21, 2022
6c3ad0f
Added hwp_rotation dependencies
bbixler500 Jan 27, 2022
601924d
Make some formatting changes in moxaSerial
BrianJKoopman Mar 24, 2022
e9a32e2
Perform encode/decode in write/readexactly only
BrianJKoopman Mar 24, 2022
53fda25
Write tests for moxaSerial
BrianJKoopman Mar 24, 2022
9656bad
Remove str encodes from pmx
BrianJKoopman Mar 24, 2022
2d9ec07
Write tests for pmx
BrianJKoopman Mar 24, 2022
61ee9f5
Add ipython notebooks to gitignore
BrianJKoopman Mar 24, 2022
5dbc7f5
Fix typos in docs
BrianJKoopman Mar 25, 2022
8dfe86e
Move mibs to non-python version specific path
BrianJKoopman Mar 25, 2022
377b333
Add support for different SNMP versions
BrianJKoopman Mar 25, 2022
b890846
input docstrings and clean up using flake8
sanahabhimani Mar 28, 2022
82afce0
Merge branch 'develop' of https://github.com/simonsobs/socs into ls37…
sanahabhimani Mar 28, 2022
7e115df
LS372 Configuration File
sanahabhimani Mar 28, 2022
a5057e7
Handle agent misconfiguration and network dropouts
BrianJKoopman Mar 25, 2022
78c9026
Remove get_cache()
BrianJKoopman Mar 28, 2022
36f9b83
Merge pull request #275 from simonsobs/koopman/m1000-patch
BrianJKoopman Mar 28, 2022
09014b3
Revert changes accidentally reverted in #173
BrianJKoopman Mar 31, 2022
118ffc0
Fix formatting on new acq_reg task docstring
BrianJKoopman Mar 31, 2022
17e79ed
Merge pull request #277 from simonsobs/koopman/fix-labjack-tasks
BrianJKoopman Mar 31, 2022
72d43a9
Write sequencer docs page
BrianJKoopman Mar 18, 2022
14d0962
Remove smurf_recorder
BrianJKoopman Mar 31, 2022
71faf50
Remove agents/smurf/
BrianJKoopman Mar 31, 2022
61169a9
Remove agents/hwp_sim/
BrianJKoopman Mar 31, 2022
98e2950
Remove path manipulation
BrianJKoopman Apr 1, 2022
3cf7541
Fix PEP8 related whitespace issues
BrianJKoopman Apr 1, 2022
c011421
Start API Reference in docs
BrianJKoopman Apr 1, 2022
ebbf93c
Move docs to within class docstrings
BrianJKoopman Apr 1, 2022
d8874d8
Clean up docstring formatting in pmx
BrianJKoopman Apr 1, 2022
8d3054d
Merge branch 'develop' into create_hwp_rotation_agent
BrianJKoopman Apr 1, 2022
6267b4e
Merge pull request #270 from simonsobs/koopman/shared-code
BrianJKoopman Apr 1, 2022
7358830
Remove branch copy of moxaSerial and pmx
BrianJKoopman Apr 1, 2022
2719b56
Merge branch 'develop' into create_hwp_rotation_agent
BrianJKoopman Apr 1, 2022
07d45b3
Remove agent copy of moxaSerial and pmx modules
BrianJKoopman Apr 1, 2022
6d2a162
Replace deprecated reparse_args
BrianJKoopman Apr 1, 2022
b90b142
Fix permissions on Dockerfile
BrianJKoopman Apr 1, 2022
48a9c64
Remove path manipulation in rotation_agent
BrianJKoopman Apr 1, 2022
1161a99
Fix use of method within class
BrianJKoopman Apr 1, 2022
3ba960d
Add hwp rotation agent to docker-compose file
BrianJKoopman Apr 1, 2022
fd75869
Protect local imports during docs build
BrianJKoopman Apr 4, 2022
e97922b
Adds pysmurf controller tasks
jlashner Mar 15, 2022
b9fd51c
Tested OCS pysmurf controller tasks
jlashner Mar 23, 2022
b854a7f
adding links to sodetlib docs to pysmurf controller
jlashner Apr 6, 2022
4d3e0b9
Fix up docstrings a bit
jlashner Apr 11, 2022
2371f7c
Added check_state task and more docs
jlashner Apr 11, 2022
c066ea5
Magpie agent (#178)
jlashner Apr 11, 2022
ccf1d58
Remove agents/pysmurf_archiver/
BrianJKoopman Apr 13, 2022
a2ba581
Remove mysql-connector dependency
BrianJKoopman Apr 13, 2022
03bce4d
Remove pysmurf landing page
BrianJKoopman Apr 14, 2022
c7b09cf
Merge pull request #278 from simonsobs/koopman/remove-old-agents
BrianJKoopman Apr 14, 2022
34dd2fb
Fix so_dev_guide link on contributing page
BrianJKoopman Mar 31, 2022
531f802
Alphabetize agent reference index
BrianJKoopman Mar 31, 2022
674afd9
Review and update user guide
BrianJKoopman Mar 31, 2022
419cdac
Fill out the missing components of the API reference
BrianJKoopman Apr 14, 2022
eeba22e
Update contents table on docs homepage
BrianJKoopman Apr 14, 2022
81a1455
Move smurf file emulator to simulators section
BrianJKoopman Apr 14, 2022
195db87
Merge pull request #279 from simonsobs/koopman/misc-docs-fixes
BrianJKoopman Apr 14, 2022
4ac8779
Create hwp rotation agent reference page
BrianJKoopman Apr 4, 2022
f0be455
Replace relative with absolute import
BrianJKoopman Apr 4, 2022
f295eea
Remove committed pid file
BrianJKoopman Apr 4, 2022
d829d59
Standardize task/process docstrings
BrianJKoopman Apr 4, 2022
a966996
Enforce type in set_direction()
BrianJKoopman Apr 4, 2022
b84e34d
Change error code on exit
BrianJKoopman Apr 4, 2022
d104c8f
Fix access to pid params in set_pid
BrianJKoopman Apr 4, 2022
9fa68a5
Lint rotation_agent
BrianJKoopman Apr 4, 2022
765e167
Remove redundant task/process start print statements
BrianJKoopman Apr 4, 2022
3f05064
Add iv_acq data to session.data
BrianJKoopman Apr 4, 2022
31ec203
Remove type check before publishing
BrianJKoopman Apr 4, 2022
c6fc9bc
device_emulator: Close socket connection on shutdown
BrianJKoopman Apr 14, 2022
32c2eaf
device_emulator: Handle bytes-like response
BrianJKoopman Apr 14, 2022
634ec85
Replace telnet with TCP connection PID controller
BrianJKoopman Apr 4, 2022
cd21976
Add tests for remaining tasks in Agent
BrianJKoopman Apr 15, 2022
f5596b8
Fix process TimeoutLock usage
BrianJKoopman Apr 15, 2022
9988833
Add test_mode and test iv_acq process
BrianJKoopman Apr 15, 2022
8823bdc
Add verbosity flag to Agent for PID class
BrianJKoopman Apr 18, 2022
66db0d5
Add flag for running iv_acq process at startup
BrianJKoopman Apr 18, 2022
9ea8561
device_emulator: Instantiate _conn as None
BrianJKoopman Apr 18, 2022
2abb2c6
pmx: Intatiate connection attributes and guard in del
BrianJKoopman Apr 18, 2022
e07aec8
rotation_agent: Remove unused import
BrianJKoopman Apr 18, 2022
a94037a
rotation_agent: Catch conneciton errors appropriately
BrianJKoopman Apr 18, 2022
809f1bc
rotation_agent: Move connection setup to init task
BrianJKoopman Apr 18, 2022
a7ec172
rotation_agent: Rename pid parameters for set_pid task
BrianJKoopman Apr 18, 2022
91a7467
rotation_agent: Add release_and_acquire to iv_acq
BrianJKoopman Apr 18, 2022
fde8b5a
rotation_agent: Remove switching lock mechanism
BrianJKoopman Apr 18, 2022
fb359b6
Magpie changes to monitor detectors in grafana
jlashner Apr 19, 2022
090e7e1
more realistic smurf-file-emulator g3 files
jlashner Apr 25, 2022
cef4096
Moves status_sample loading into a function
jlashner Apr 25, 2022
4bf5729
Adds additional parameters to stream function
simonscryo Apr 26, 2022
15ec361
fix PR suggestions
jlashner Apr 27, 2022
c8f61b1
Replace 372 simulator with device emulator
BrianJKoopman Apr 27, 2022
c30d53b
workflows: Remove 372 simulator image build
BrianJKoopman Apr 27, 2022
cdbfc02
Merge pull request #285 from simonsobs/koopman/fix-flaky-ls372-tests
BrianJKoopman Apr 27, 2022
ae00541
Remove pytest on PR, rely always on push trigger
BrianJKoopman Apr 27, 2022
dbed974
Reuse pytest workflow instead of copying contents
BrianJKoopman Apr 27, 2022
5efe57f
Skip workflows if only docs have changed
BrianJKoopman Apr 27, 2022
c457287
Create dummy workflows for when required checks skip
BrianJKoopman Apr 27, 2022
4759dc4
Merge pull request #286 from simonsobs/koopman/workflow-improvements
BrianJKoopman Apr 28, 2022
bcf1edd
Only run dummy workflow on PRs not on push
BrianJKoopman Apr 28, 2022
3729671
Merge pull request #288 from simonsobs/koopman/skipped-pytest-workflow
BrianJKoopman Apr 28, 2022
e8bd82e
Commit pre-commit and flake8 configs
BrianJKoopman Apr 28, 2022
13bdb94
Add pre-commit description to contributing page
BrianJKoopman Apr 28, 2022
ca60a4d
Add new configuration files to paths in workflows
BrianJKoopman Apr 28, 2022
f734a58
Scpi psu monitor_output update (#284)
mjrand Apr 28, 2022
d620bca
Adds session.data to pysmurf controller docstrings
jlashner Apr 28, 2022
920c8fd
Fix tests?
jlashner Apr 28, 2022
eff2efc
More docs mocks
jlashner Apr 28, 2022
4eec78d
Create dependabot configuration
BrianJKoopman Apr 28, 2022
d45554e
Replace docker login with docker/login-action (#289)
BrianJKoopman Apr 28, 2022
caa44ca
Bump actions/setup-python from 2 to 3 (#290)
dependabot[bot] Apr 28, 2022
2a8b5cf
Bump actions/checkout from 2 to 3 (#291)
dependabot[bot] Apr 28, 2022
91a63fa
Tested check_state process on smurf-server
Apr 28, 2022
1cdfbbd
rewords task / process docstrings
jlashner Apr 28, 2022
236a3ad
bump sodetlib version to v0.4.0
jlashner Apr 28, 2022
13fb8c0
Address PR comments
jlashner Apr 29, 2022
9a08e84
Small fixes
jlashner Apr 29, 2022
2a8360d
Adds additional args to stream docstring
jlashner Apr 29, 2022
c7f39fd
Merge branch 'develop' into pysmurf_controller_tasks
jlashner Apr 29, 2022
3425afa
Remove debug print statements
jlashner Apr 29, 2022
47d07d3
Merge pull request #282 from simonsobs/magpie_downsampled_feed
BrianJKoopman Apr 29, 2022
7368d5d
Merge pull request #283 from simonsobs/smurf_file_emulator_realistic_g3
BrianJKoopman Apr 29, 2022
39faf27
Adds stream_id to session.data docstring
jlashner May 2, 2022
420b120
Merge branch 'develop' of https://github.com/simonsobs/socs into ls37…
sanahabhimani May 2, 2022
9275cb5
turn input_configfile into task and address indentation and docstring…
sanahabhimani May 2, 2022
9380852
Change check_state queries to automatically convert to strings
May 3, 2022
cdb47a1
change prints to self.log.info and remove filepath arg in input_confi…
sanahabhimani May 3, 2022
08a57e9
remove 372 configfile in agent dir
sanahabhimani May 5, 2022
cbfa632
input /Users/sanahbhimani/git/ls372-ocs-site-configs path so that arg…
sanahabhimani May 5, 2022
e1ef8ad
Remove telnet install from Dockerfile
BrianJKoopman May 5, 2022
f68a4ad
Add terminating characters to messages
BrianJKoopman May 5, 2022
c1d7054
Add short timeouts to acquire_timeout in tasks
BrianJKoopman May 5, 2022
8ac56e8
Merge pull request #281 from simonsobs/koopman/hwp-rotation-updates
BrianJKoopman May 5, 2022
e96e4cf
Merge branch 'develop' into create_hwp_rotation_agent
BrianJKoopman May 5, 2022
ffd6462
Merge pull request #157 from simonsobs/create_hwp_rotation_agent
BrianJKoopman May 5, 2022
79baa04
Merge branch 'develop' of https://github.com/simonsobs/socs into ls37…
sanahabhimani May 5, 2022
fb5383e
add 372 configfile example in 372 readthedocs
sanahabhimani May 5, 2022
d434b26
change params[] to params.get() for 372 unit tests
sanahabhimani May 5, 2022
ba3a2b7
Bump docker/login-action from 1 to 2
dependabot[bot] May 6, 2022
1bf3486
Merge pull request #287 from simonsobs/koopman/pre-commit
BrianJKoopman May 6, 2022
26e65c9
Merge pull request #292 from simonsobs/dependabot/github_actions/dock…
BrianJKoopman May 6, 2022
d2f815b
Merge pull request #276 from simonsobs/ls372_configfiles
BrianJKoopman May 6, 2022
299f3dd
Merge pull request #280 from simonsobs/pysmurf_controller_tasks
BrianJKoopman May 10, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[flake8]
max_line_length = 80
ignore = E501
in-place = true
recursive = true
aggressive = 2
exclude =
agents/meinberg_m1000/mibs/MBG-SNMP-LTNG-MIB.py
agents/meinberg_m1000/mibs/SNMPv2-MIB.py
agents/meinberg_m1000/mibs/MBG-SNMP-ROOT-MIB.py
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
77 changes: 10 additions & 67 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,67 +6,7 @@ on:

jobs:
test:
name: pytest with coverage
runs-on: ubuntu-latest

steps:
- name: Install system packages
run: |
sudo apt-get install -y socat

- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8

# (start steps from pytest workflow)
# Install
- name: Install so3g
run: |
pip3 install so3g

# Fetch all history for all tags and branches
- name: clone socs
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Install socs
run: |
pip3 install -r requirements.txt
pip3 install -e .

# Unit Tests
- name: Run unit tests
working-directory: ./tests
run: |
COVERAGE_FILE=.coverage.unit python3 -m pytest --cov -m 'not integtest'

- name: Build docker test images
run: |
docker-compose build socs

# Integration Tests
- name: Build images for integration tests
run: |
docker-compose build ocs-lakeshore372-simulator

- name: Run integration tests
working-directory: ./tests
run: |
COVERAGE_FILE=.coverage.int python3 -m pytest --cov -m 'integtest'

# Coverage
- name: Report test coverage
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
mv ./tests/.coverage.* ./
pip install coveralls
coverage combine
coverage report
coveralls --service=github
# (end steps from pytest workflow)
uses: ./.github/workflows/pytest.yml

docker:
name: build and deploy docker images
Expand All @@ -76,7 +16,7 @@ jobs:
steps:
# Fetch all history for all tags and branches
- name: clone socs
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand All @@ -85,14 +25,17 @@ jobs:
run: |
docker-compose build

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.REGISTRY_PASSWORD }}

- name: Build and push official docker image
env:
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
DOCKERHUB_ORG: "simonsobs"
run: |
export DOCKER_TAG=`git describe --tags --always`
echo "${REGISTRY_PASSWORD}" | docker login -u "${REGISTRY_USER}" --password-stdin;

# Tag all images for upload to the registry
docker-compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker tag {}:latest ${DOCKERHUB_ORG}/{}:latest
Expand All @@ -113,12 +56,12 @@ jobs:

steps:
- name: Set up Python 3.8
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: 3.8

- name: clone socs
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: install build dependencies
run: |
Expand Down
121 changes: 51 additions & 70 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,75 +3,16 @@ name: Build Develop Images
on:
push:
branches: [ develop ]
paths-ignore:
- 'docs/**'
- '*.rst'
- '*.md'
- '.flake8'
- '.pre-commit-config.yaml'

jobs:
test:
name: pytest with coverage
runs-on: ubuntu-latest

steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}

- name: Install system packages
run: |
sudo apt-get install -y socat

- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8

# (start steps from pytest workflow)
# Install
- name: Install so3g
run: |
pip3 install so3g

# Fetch all history for all tags and branches
- name: clone socs
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Install socs
run: |
pip3 install -r requirements.txt
pip3 install -e .

# Unit Tests
- name: Run unit tests
working-directory: ./tests
run: |
COVERAGE_FILE=.coverage.unit python3 -m pytest --cov -m 'not integtest'

- name: Build docker test images
run: |
docker-compose build socs

# Integration Tests
- name: Build images for integration tests
run: |
docker-compose build ocs-lakeshore372-simulator

- name: Run integration tests
working-directory: ./tests
run: |
COVERAGE_FILE=.coverage.int python3 -m pytest --cov -m 'integtest'

# Coverage
- name: Report test coverage
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
mv ./tests/.coverage.* ./
pip install coveralls
coverage combine
coverage report
coveralls --service=github
# (end steps from pytest workflow)
uses: ./.github/workflows/pytest.yml

build:
name: build and deploy dev images
Expand All @@ -81,7 +22,7 @@ jobs:
steps:
# Fetch all history for all tags and branches
- name: clone socs
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand All @@ -90,19 +31,59 @@ jobs:
run: |
docker-compose build

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.REGISTRY_USER }}
password: ${{ secrets.REGISTRY_PASSWORD }}

- name: Build and push development docker image
env:
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
DOCKERHUB_ORG: "simonsobs"
run: |
export DOCKER_TAG=`git describe --tags --always`-dev
echo "${DOCKER_TAG}"
echo "${REGISTRY_PASSWORD}" | docker login -u "${REGISTRY_USER}" --password-stdin;

# Tag all images for upload to the registry
docker-compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker tag {}:latest ${DOCKERHUB_ORG}/{}:${DOCKER_TAG}

# Upload to docker registry
docker-compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} docker push ${DOCKERHUB_ORG}/{}:${DOCKER_TAG}
docker-compose config | grep 'image: ' | awk -F ': ' '{ print $2 }' | xargs -I {} echo ${DOCKERHUB_ORG}/{}:${DOCKER_TAG} pushed

# testing so we can catch any issues before release
# if issues are found, test locally, or copy to pytest.yml for test on push
wheel:
name: build and test wheel
needs: test
runs-on: ubuntu-latest

steps:
- name: Set up Python 3.8
uses: actions/setup-python@v3
with:
python-version: 3.8

- name: clone socs
uses: actions/checkout@v3

- name: install build dependencies
run: |
python3 -m pip install --upgrade build twine

- name: build wheel
run: |
python3 -m build

- name: install wheel
run: |
python3 -m pip install dist/socs*.whl

- name: install testing requirements
run: |
pip3 install -r requirements/testing.txt

- name: Run unit tests
working-directory: ./tests
run: |
python3 -m pytest -m 'not integtest'
16 changes: 9 additions & 7 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ name: Run Tests
on:
push:
branches-ignore: [ develop ]
pull_request:
paths-ignore:
- 'docs/**'
- '*.rst'
- '*.md'
- '.flake8'
- '.pre-commit-config.yaml'
workflow_call:

jobs:
test:
Expand All @@ -21,7 +27,7 @@ jobs:
sudo apt-get install -y socat

- name: Set up Python 3.8
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: 3.8

Expand All @@ -31,7 +37,7 @@ jobs:
pip3 install so3g

- name: clone socs
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Install socs
run: |
Expand All @@ -49,10 +55,6 @@ jobs:
docker-compose build socs

# Integration Tests
- name: Build images for integration tests
run: |
docker-compose build ocs-lakeshore372-simulator

- name: Run integration tests
working-directory: ./tests
run: |
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/skipped-pytest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Run Tests

on:
pull_request:
paths:
- 'docs/**'
- '*.rst'
- '*.md'
- '.flake8'
- '.pre-commit-config.yaml'

jobs:
test:
name: pytest with coverage
runs-on: ubuntu-latest

steps:
- run: 'echo "No build required" '
18 changes: 18 additions & 0 deletions .github/workflows/skipped-test-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Test Docker Build

on:
pull_request:
paths:
- 'docs/**'
- '*.rst'
- '*.md'
- '.flake8'
- '.pre-commit-config.yaml'

jobs:
build:
name: test image build
runs-on: ubuntu-latest

steps:
- run: 'echo "No build required" '
27 changes: 27 additions & 0 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Test Docker Build

on:
pull_request:
paths-ignore:
- 'docs/**'
- '*.rst'
- '*.md'
- '.flake8'
- '.pre-commit-config.yaml'

jobs:
build:
name: test image build
runs-on: ubuntu-latest

steps:
# Fetch all history for all tags and branches
- name: clone socs
uses: actions/checkout@v3
with:
fetch-depth: 0

# Dockerize
- name: Build docker images
run: |
docker-compose build
Loading