Skip to content

Commit 07c81fe

Browse files
committed
Merge branch 'master' into ISSUE_13653
2 parents 8415d5f + daf12af commit 07c81fe

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

.github/workflows/codeql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
analyze:
2525
name: Analyze
2626
runs-on: ubuntu-latest
27+
if: ${{ github.event.pull_request.user.login != 'dependabot[bot]'}}
2728
permissions:
2829
actions: read
2930
contents: read

.github/workflows/flake8.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
python-version: [ '3.12']
1717

1818
runs-on: ubuntu-latest
19+
if: ${{ github.event.pull_request.user.login != 'dependabot[bot]'}}
1920

2021
steps:
2122
- name: Checkout repository

.github/workflows/tests.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: GeoNode Test Suites
33
on:
44
pull_request:
55
types: [opened, synchronize, reopened, ready_for_review]
6+
workflow_dispatch:
67

78
jobs:
89
# -------------------------------------------------
@@ -11,7 +12,7 @@ jobs:
1112
build_images:
1213
name: Build and export Docker images
1314
runs-on: ubuntu-24.04
14-
if: ${{ !github.event.pull_request.draft }}
15+
if: ${{ github.event_name != 'pull_request' || (github.event.pull_request.user.login != 'dependabot[bot]' && !github.event.pull_request.draft) }}
1516

1617
steps:
1718
- name: Checkout repository
@@ -52,7 +53,7 @@ jobs:
5253
test_command: >
5354
TESTS=$(python -c 'import sys; from geonode import settings; print(" ".join([a + ".tests"
5455
for a in settings.GEONODE_APPS if "security" not in a and "geoserver" not in a and "upload" not in a]))') &&
55-
./tests/test.sh $TESTS --duration=30 --failfast
56+
./tests/test.sh $TESTS geonode.thumbs.tests geonode.people.tests geonode.people.socialaccount.providers.geonode_openid_connect.tests --duration=30 --failfast
5657
5758
security:
5859
uses: ./.github/workflows/run-test-suite.yml

celery-cmd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ CELERY__HARVESTER_WORKER_NAME=${CELERY__HARVESTER_WORKER_NAME:-"harvesting_worke
2020
CELERY__HARVESTER_CONCURRENCY=${CELERY__HARVESTER_CONCURRENCY:-"10"}
2121
CELERY__HARVESTER_AUTOSCALE_VALUES=${CELERY__HARVESTER_AUTOSCALE_VALUES:-"15,10"}
2222
CELERY__HARVESTER_MAX_MEMORY_PER_CHILD=${CELERY__MAX_MEMORY_PER_CHILD:-"500000"}
23-
CELERY__HARVESTER_LOG_FILE=${CELERY__HARVESTER_LOG_FILE:-"/var/log/celery_harvester.log"}
2423

2524
$CELERY_BIN -A $CELERY_APP worker --autoscale=$CELERY__AUTOSCALE_VALUES \
2625
--max-memory-per-child=$CELERY__MAX_MEMORY_PER_CHILD $CELERY__OPTS \
@@ -35,7 +34,7 @@ $CELERY_BIN -A $CELERY_APP worker -Q harvesting \
3534
--loglevel=$CELERY__LOG_LEVEL \
3635
-n $CELERY__HARVESTER_WORKER_NAME \
3736
--concurrency=$CELERY__HARVESTER_CONCURRENCY \
38-
-f $CELERY__HARVESTER_LOG_FILE &
37+
-f $CELERY__LOG_FILE &
3938

4039
# Keep the container alive
4140
wait

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Pillow==11.3.0
33
lxml==5.2.1
44
psycopg2==2.9.9
5-
Django==5.2
5+
Django==5.2.7
66

77
# Other
88
beautifulsoup4==4.12.3
@@ -149,5 +149,5 @@ selenium-requests==2.0.4
149149
webdriver_manager==4.0.1
150150

151151
# Security and audit
152-
cryptography==45.0.5
152+
cryptography==46.0.3
153153
jwcrypto>=1.5.6

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ install_requires =
2828
Pillow==11.3.0
2929
lxml==5.2.1
3030
psycopg2==2.9.9
31-
Django==5.2
31+
Django==5.2.7
3232

3333
# Other
3434
beautifulsoup4==4.12.3
@@ -174,7 +174,7 @@ install_requires =
174174
webdriver_manager==4.0.1
175175

176176
# Security and audit
177-
cryptography==45.0.5
177+
cryptography==46.0.3
178178
jwcrypto>=1.5.6
179179

180180

0 commit comments

Comments
 (0)