Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/AppDaemon/appdaemon into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
acockburn committed Feb 5, 2024
2 parents 4cf2eb9 + 2469b7d commit 69205a1
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: actions/checkout@v4
# https://github.com/actions/setup-python
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
cache: 'pip' # caching pip dependencies
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
uses: actions/checkout@v4
# https://github.com/actions/setup-python
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
cache: 'pip' # caching pip dependencies
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/[email protected].0
uses: docker/[email protected].1
with:
images: ${{ env.IMAGE_NAME }}
# Customize the generation of Docker `latest` tag
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
# https://github.com/actions/setup-python
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'pip' # caching pip dependencies
Expand All @@ -38,7 +38,7 @@ jobs:
- uses: actions/checkout@v4
# https://github.com/actions/setup-python
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: 'pip' # caching pip dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stale-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: question, wait-response
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
- uses: actions/stale@v9
with:
stale-issue-message: 'This issue is stale because it has been open for 45 days with no activity. Remove stale label or comment or this will be closed in 15 days.'
close-issue-message: 'Please feel free re-open this issue if you have new information available'
Expand All @@ -38,7 +38,7 @@ jobs:
name: without label
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
- uses: actions/stale@v9
with:
stale-issue-message: 'This issue is stale because it has been open for 6 months with no activity. Remove stale label or comment or this will be closed in 15 days.'
close-issue-message: 'Please feel free re-open this issue if you have new information available'
Expand Down
6 changes: 3 additions & 3 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ python-engineio==4.8.2
# via python-socketio
python-socketio==5.11.0
# via appdaemon (pyproject.toml)
pytz==2023.3.post1
pytz==2024.1
# via appdaemon (pyproject.toml)
pyyaml==6.0.1
# via
# appdaemon (pyproject.toml)
# pre-commit
requests==2.28.2
# via appdaemon (pyproject.toml)
ruff==0.1.15
ruff==0.2.0
# via appdaemon (pyproject.toml)
sgmllib3k==1.0.0
# via feedparser
Expand All @@ -148,7 +148,7 @@ tomli-w==1.0.0
# via appdaemon (pyproject.toml)
urllib3==1.26.18
# via requests
uvloop==0.17.0 ; sys_platform != "win32"
uvloop==0.19.0 ; sys_platform != "win32"
# via appdaemon (pyproject.toml)
virtualenv==20.25.0
# via pre-commit
Expand Down
6 changes: 3 additions & 3 deletions doc-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ python-engineio==4.8.2
# via python-socketio
python-socketio==5.11.0
# via appdaemon (pyproject.toml)
pytz==2023.3.post1
pytz==2024.1
# via appdaemon (pyproject.toml)
pyyaml==6.0.1
# via
Expand Down Expand Up @@ -125,7 +125,7 @@ sphinx==6.2.1
# sphinx-autobuild
# sphinx-rtd-theme
# sphinxcontrib-jquery
sphinx-autobuild==2021.3.14
sphinx-autobuild==2024.2.4
# via appdaemon (pyproject.toml)
sphinx-rtd-theme==2.0.0
# via appdaemon (pyproject.toml)
Expand All @@ -151,7 +151,7 @@ tornado==6.4
# via livereload
urllib3==1.26.18
# via requests
uvloop==0.17.0 ; sys_platform != "win32"
uvloop==0.19.0 ; sys_platform != "win32"
# via appdaemon (pyproject.toml)
websocket-client==1.7.0
# via appdaemon (pyproject.toml)
Expand Down
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ dependencies = [
'pid ~= 3.0.4',
'python-dateutil ~= 2.8.2',
'python-socketio >= 5.5,< 5.12',
'pytz >= 2022.7.1,< 2023.4.0',
'pytz >= 2022.7.1,< 2024.2.0',
'pyyaml ~= 6.0.1',
'requests ~= 2.28.2',
'sockjs ~= 0.11.0',
'uvloop==0.17.0; sys_platform != "win32"',
'uvloop==0.19.0; sys_platform != "win32"',
'websocket-client >= 1.5.1,< 1.8.0',
'tomli ~= 2.0.1',
'tomli_w ~= 1.0.0'
Expand Down Expand Up @@ -59,12 +59,12 @@ dev = [
"black >= 23.1,< 24.2",
'pre-commit >= 3.1.1,< 3.6.0; python_version>"3.7"', # pre-commit does not support Python < 3.8
"pytest >= 7.2.1,< 8.1.0",
"ruff>= 0.0.261,< 0.2.0"
"ruff>= 0.0.261,< 0.3.0"
]

# Dependencies required to build the documentation using sphinx
doc = [
"sphinx-autobuild ~= 2021.3.14",
"sphinx-autobuild >= 2021.3.14,< 2024.3.0",
"sphinx-rtd-theme == 2.0.0",
"pygments >= 2.14,< 2.18",
"myst-parser == 1.0.0",
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ python-engineio==4.8.2
# via python-socketio
python-socketio==5.11.0
# via appdaemon (pyproject.toml)
pytz==2023.3.post1
pytz==2024.1
# via appdaemon (pyproject.toml)
pyyaml==6.0.1
# via appdaemon (pyproject.toml)
Expand All @@ -83,7 +83,7 @@ tomli-w==1.0.0
# via appdaemon (pyproject.toml)
urllib3==1.26.18
# via requests
uvloop==0.17.0 ; sys_platform != "win32"
uvloop==0.19.0 ; sys_platform != "win32"
# via appdaemon (pyproject.toml)
websocket-client==1.7.0
# via appdaemon (pyproject.toml)
Expand Down

0 comments on commit 69205a1

Please sign in to comment.