Skip to content
Draft
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
df86024
draft: sketched out SO interface CI workflow.
tristpinsm Sep 24, 2024
2bdc678
Initial draft of check_so_interface.py code(in so-interface-ci)
Nov 15, 2024
d9718b5
Initial draft of check_so_interface.py code(in so-interface-ci)
Nov 15, 2024
a094bfe
Second draft of check_so_interface.py code, still adjusting compare_a…
Nov 28, 2024
cde2320
Functional version of code, changes necessary for neatness
Dec 5, 2024
506e39e
Check so-interface functions, classes
Jan 16, 2025
0a49fca
Temporary changes
Feb 21, 2025
ca1f2e0
Better dictionary loops and improved functionality
Feb 25, 2025
7d44401
Cleaned, no class checking
Feb 27, 2025
e4a8775
Finalizing changes
Mar 8, 2025
ac8085c
Checking workflows yaml syntax
Mar 25, 2025
1c2b712
Checking workflows 2
Mar 25, 2025
3c695a0
Checking workflows 3
Mar 25, 2025
a98000d
Checking workflows 4
Mar 25, 2025
4559aec
Checking workflows 5
Mar 26, 2025
0db56b2
Updating errors, returns
Mar 26, 2025
139738b
Intentionally breaking: altering run_iv args
Apr 3, 2025
3b8e865
Exceptions, Docstrings, and only one ast.walk
Apr 3, 2025
75f6415
Exceptions, comments, minor error fixes
Apr 17, 2025
a5405f9
Ubuntu version deprecated fix
Apr 17, 2025
be49e5b
Ubuntu version deprecated fix 2
Apr 17, 2025
b61ca5d
Fixing ubuntu python 3.8.10 error
Apr 18, 2025
0d2f788
Python version change to work ubuntu
Apr 18, 2025
df9d979
Python fix, Ubuntu 24.04 not working with Python 3.8.10
Apr 18, 2025
6e67d89
fix(workflow): Add quotes to python version string.
tristpinsm Apr 18, 2025
448ebfd
fix(workflow): Bump version of setup-python.
tristpinsm Apr 18, 2025
f15c04b
fix(workflow): Use ubuntu-latest.
tristpinsm Apr 18, 2025
ef85bd4
fix(workflow): Bump to python 3.9.
tristpinsm Apr 18, 2025
911851e
fix(workflow): Try single quotes...
tristpinsm Apr 18, 2025
7454b55
fix(workflow): python 3.8.12
tristpinsm Apr 18, 2025
869f894
Remove .DS_Store from repository
Apr 25, 2025
8476b48
updating my branch
Apr 25, 2025
d168701
Fixing exceptions with f-strings
Apr 28, 2025
57162fd
Nodes in body check dict index fix
Apr 28, 2025
109e306
remove remaining .DS_Store
tristpinsm Apr 28, 2025
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
13 changes: 13 additions & 0 deletions .github/workflows/interface_ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: interface-ci
on: [pull_request]
jobs:
checks-so-interface:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./tests/ci
steps:
- name: Check out the repository to the runner
uses: actions/checkout@v4
- name: Check SO interface spec
run: python ./check_so_interface.py
36 changes: 18 additions & 18 deletions .github/workflows/test-or-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ jobs:
# Run flake8 on all .py files. Should block deploys to Read The Docs.
flake8:
name: Flake8 Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
# Checkout the code
- name: Checkout code
uses: actions/checkout@v2

# Setup python3
- name: setup python 3.8.10
uses: actions/setup-python@v2
- name: setup python
uses: actions/setup-python@v5
with:
python-version: 3.8.10
python-version: '3.8.12'

# Install flake8 modules
- name: Install dependencies
Expand All @@ -53,7 +53,7 @@ jobs:
# Validate the server docker image definitions
docker-definitions:
name: Docker Definition Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
# Checkout the code.
# We use ssh key authentication to be able to access other private
Expand All @@ -79,18 +79,18 @@ jobs:
# Documentation automatic build tests
test-docs:
name: Documentation Build Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
needs: [flake8, docker-definitions] # Run only if all checks passed
steps:
# Checkout the code
- name: Checkout code
uses: actions/checkout@v2

# Setup python 3.8.10
- name: Setup python 3.8.10
uses: actions/setup-python@v2
# Setup python
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: 3.8.10
python-version: '3.8.12'

# Install requirements, pysmurf, and sphinx
- name: Install dependencies
Expand All @@ -108,7 +108,7 @@ jobs:
# Server tests
test-server:
name: Server Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
needs: [flake8, docker-definitions] # Run only if all checks passed
steps:
# Checkout the code
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
# Client tests
test-client:
name: Client Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
needs: [flake8, docker-definitions] # Run only if all checks passed
steps:
# Checkout the code
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
# Deploy new release notes to GitHub
deploy-release-notes:
name: Generate Release Notes
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
needs: [test-docs, test-server, test-client] # Run only if all tests passed
if: startsWith(github.ref, 'refs/tags/') # Run only on tagged releases
steps:
Expand All @@ -252,10 +252,10 @@ jobs:
run: echo ::set-output name=tag::"${GITHUB_REF#refs/tags/}"

# Setup python3
- name: Setup python 3.8.10
uses: actions/setup-python@v2
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: 3.8.10
python-version: '3.8.12'

# Install dependencies of the releaseGen.py script
- name: Install dependencies
Expand All @@ -275,7 +275,7 @@ jobs:
# Server docker
deploy-server:
name: Build Server Docker Image
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
needs: [test-docs, test-server, test-client] # Run only if all tests passed
if: startsWith(github.ref, 'refs/tags/') # Run only on tagged releases
steps:
Expand Down Expand Up @@ -315,7 +315,7 @@ jobs:
# Client docker
deploy-client:
name: Build Client Docker Image
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
needs: [test-docs, test-server, test-client] # Run only if all tests passed
if: startsWith(github.ref, 'refs/tags/') # Run only on tagged releases
steps:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ wheels/
*.egg-info/
.installed.cfg
*.egg
**/.DS_Store
2 changes: 1 addition & 1 deletion python/pysmurf/client/base/smurf_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ def validate_config(loaded_config):

# data_out_mux
Optional("data_out_mux",
default=default_data_out_mux_dict[band]) : \
default=default_data_out_mux_dict[band]) :
And([Use(int)], list, lambda l: len(l) == 2 and
l[0] != l[1] and all(0 <= ll <= 9 for ll in l)),

Expand Down
Binary file renamed .DS_Store → tests/.DS_Store
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this before we merge

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this file is still here...

Binary file not shown.
Loading
Loading