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.

Sign up for GitHub

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

Deploy to stage #884

Merged
merged 21 commits into from
Jan 7, 2025
Merged

Deploy to stage #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8f4c964
Bump codecov/codecov-action from 5.1.1 to 5.1.2
dependabot[bot] Dec 18, 2024
e40d447
Bump jinja2 from 3.1.4 to 3.1.5 in /requirements
dependabot[bot] Dec 24, 2024
133ee46
Compile requirements files
dependabot[bot] Dec 24, 2024
51fdc1b
Bump django-allauth from 65.3.0 to 65.3.1
dependabot[bot] Dec 26, 2024
53c1045
Bump mypy from 1.13.0 to 1.14.1
dependabot[bot] Dec 30, 2024
223d80c
Bump ruff from 0.8.2 to 0.8.6
dependabot[bot] Jan 6, 2025
8867bea
Merge pull request #876 from UW-GAC/pip-tools/update-requirements-fil…
amstilp Jan 6, 2025
ae473b7
Merge dependabot/pip/ruff-0.8.6 into combined-prs-branch
github-actions[bot] Jan 6, 2025
952df59
Merge dependabot/pip/mypy-1.14.1 into combined-prs-branch
github-actions[bot] Jan 6, 2025
6d35822
Merge dependabot/pip/django-allauth-65.3.1 into combined-prs-branch
github-actions[bot] Jan 6, 2025
c8f3711
Merge dependabot/pip/requirements/jinja2-3.1.5 into combined-prs-branch
github-actions[bot] Jan 6, 2025
00a13d0
Merge dependabot/github_actions/codecov/codecov-action-5.1.2 into com…
github-actions[bot] Jan 6, 2025
7cfad55
Merge pull request #881 from UW-GAC/combined-prs-branch
amstilp Jan 6, 2025
366d6ae
Bump actions/upload-artifact from 4.4.3 to 4.5.0
dependabot[bot] Jan 6, 2025
5188d8f
Merge pull request #871 from UW-GAC/dependabot/github_actions/actions…
amstilp Jan 6, 2025
74abb78
Change requirements file to use interim version of ACM
amstilp Jan 7, 2025
e838358
Add the new auditor app to the settings file
amstilp Jan 7, 2025
f3eb979
Update ACM version in requirements.in file
amstilp Jan 7, 2025
dfaef07
Compile requirements files
amstilp Jan 7, 2025
3ede4bb
Merge pull request #883 from UW-GAC/pip-tools/update-requirements-fil…
amstilp Jan 7, 2025
018e10b
Merge pull request #882 from UW-GAC/maint/acm-v0.28
amstilp Jan 7, 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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
run: ls -lhta

- name: Upload coverage data
uses: actions/upload-artifact@v4.4.3
uses: actions/upload-artifact@v4.5.0
with:
name: coverage-data-${{ strategy.job-index }}
path: coverage-${{ strategy.job-index }}
Expand Down Expand Up @@ -140,6 +140,6 @@ jobs:
python -m coverage report

- name: Upload coverage to Codecov
uses: codecov/[email protected].1
uses: codecov/[email protected].2
with:
token: ${{ secrets.CODECOV_TOKEN }}
1 change: 1 addition & 0 deletions config/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@

LOCAL_APPS = [
"anvil_consortium_manager",
"anvil_consortium_manager.auditor",
"gregor_django.users.apps.UsersConfig",
# Your stuff: custom apps go here
"gregor_django.drupal_oauth_provider",
Expand Down
6 changes: 3 additions & 3 deletions requirements/dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ isort==5.13.2
# via pylint
jedi==0.19.1
# via ipython
jinja2==3.1.4
jinja2==3.1.5
# via sphinx
markupsafe==2.1.5
# via
Expand All @@ -100,7 +100,7 @@ matplotlib-inline==0.1.6
# via ipython
mccabe==0.7.0
# via pylint
mypy==1.13.0
mypy==1.14.1
# via -r requirements/dev-requirements.in
mypy-extensions==1.0.0
# via mypy
Expand Down Expand Up @@ -150,7 +150,7 @@ requests==2.32.3
# -c requirements/requirements.txt
# -c requirements/test-requirements.txt
# sphinx
ruff==0.8.2
ruff==0.8.6
# via -r requirements/dev-requirements.in
six==1.16.0
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ django-extensions # https://github.com/django-extensions/django-extensions
# Bootstrap5 templates for crispy-forms
crispy-bootstrap5 # https://github.com/django-crispy-forms/crispy-bootstrap5

django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.27.0
django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.28
# Simple history - model history tracking
django-simple-history

Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ django==4.2.17
# django-picklefield
# django-simple-history
# django-tables2
django-allauth==65.3.0
django-allauth==65.3.1
# via -r requirements/requirements.in
django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.27.0
django-anvil-consortium-manager @ git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.28
# via -r requirements/requirements.in
django-autocomplete-light==3.11.0
# via django-anvil-consortium-manager
Expand Down
Loading