Skip to content

Commit

Permalink
Merge pull request #765 from Hugovdberg/develop
Browse files Browse the repository at this point in the history
chore: update CI/docs
  • Loading branch information
Hugovdberg authored Jun 22, 2024
2 parents 1932c55 + 7cdb49e commit 00340b6
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 15 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
name: Test PIconnect

on:
push:
branches: [develop, master]
pull_request:
# The branches below must be a subset of the branches above
branches: [develop, master]
Expand All @@ -26,10 +24,10 @@ jobs:
]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -49,10 +47,10 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python 3.10
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand All @@ -74,7 +72,7 @@ jobs:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout code
# uses: actions/checkout@v3
# uses: actions/checkout@v4

# - name: Run Codacy Analysis CLI
# uses: codacy/codacy-analysis-cli-action@master
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/publish-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: Install dependencies
Expand All @@ -33,7 +33,7 @@ jobs:
- name: Build package
run: python -m build --outdir ./dist
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: PIconnect_builds
path: ./dist/
Expand All @@ -42,17 +42,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install build
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: PIconnect_builds
path: ./dist/
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cffi==1.17.0rc1; python_version >= '3.8'
clr-loader==0.2.6; python_version >= '3.7'
numpy==1.26.4; python_version >= '3.9'
pandas==2.2.2; python_version >= '3.9'
-e . ; python_version >= '3.8'
-e . ; python_version >= '3.9'
pycparser==2.22; python_version >= '3.8'
python-dateutil==2.9.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
pythonnet==3.0.3; python_version < '3.13' and python_version >= '3.7'
Expand Down
6 changes: 5 additions & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
-i https://pypi.org/simple
accessible-pygments==0.0.5; python_version >= '3.9'
alabaster==0.7.16; python_version >= '3.9'
annotated-types==0.7.0; python_version >= '3.8'
astroid==3.2.2; python_full_version >= '3.8.0'
babel==2.15.0; python_version >= '3.8'
beautifulsoup4==4.13.0b2; python_full_version >= '3.6.0'
bracex==2.4; python_version >= '3.8'
bump-my-version==0.23.0; python_version >= '3.8'
certifi==2024.6.2; python_version >= '3.6'
Expand Down Expand Up @@ -38,6 +40,7 @@ prompt-toolkit==3.0.36; python_full_version >= '3.6.2'
pydantic==2.7.4; python_version >= '3.8'
pydantic-core==2.18.4; python_version >= '3.8'
pydantic-settings==2.3.3; python_version >= '3.8'
pydata-sphinx-theme==0.15.4rc0; python_version >= '3.9'
pygments==2.18.0; python_version >= '3.8'
pylint==3.2.3; python_full_version >= '3.8.0'
pytest==8.2.2; python_version >= '3.8'
Expand All @@ -54,6 +57,7 @@ rich==13.7.1; python_full_version >= '3.7.0'
rich-click==1.8.3; python_version >= '3.7'
ruff==0.4.10; python_version >= '3.7'
snowballstemmer==2.2.0
soupsieve==2.5; python_version >= '3.8'
sphinx==7.3.7; python_version >= '3.9'
sphinxcontrib-applehelp==1.0.8; python_version >= '3.9'
sphinxcontrib-devhelp==1.0.6; python_version >= '3.9'
Expand All @@ -72,7 +76,7 @@ cffi==1.17.0rc1; python_version >= '3.8'
clr-loader==0.2.6; python_version >= '3.7'
numpy==1.26.4; python_version >= '3.9'
pandas==2.2.2; python_version >= '3.9'
-e . ; python_version >= '3.8'
-e . ; python_version >= '3.9'
pycparser==2.22; python_version >= '3.8'
python-dateutil==2.9.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
pythonnet==3.0.3; python_version < '3.13' and python_version >= '3.7'
Expand Down

0 comments on commit 00340b6

Please sign in to comment.