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

Jump to bottom

adds develop branch with ci job #92

Merged
merged 2 commits into from
Aug 22, 2023
Merged

adds develop branch with ci job #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eed8a9c
adds develop branch with ci job
joerivrij Aug 22, 2023
57a2119
adds a higher version of pyyaml
joerivrij Aug 22, 2023
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ on:
push:
branches:
- "stable/*"
- "develop"
pull_request:
branches:
- "develop"
- "master"

env:
Expand Down
1 change: 1 addition & 0 deletions requirements/base.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ raven
Sphinx
sphinx-rtd-theme
markdown
pyyaml==6.0.1

Django~=3.2
django-axes
Expand Down
7 changes: 4 additions & 3 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.9
# To update, run:
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# ./bin/compile_dependencies.sh
#
Expand Down Expand Up @@ -136,8 +136,9 @@ pytz==2022.2.1
# babel
# django
# drf-yasg
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/base.in
# gemma-zds-client
# oyaml
# vng-api-common
Expand Down
6 changes: 3 additions & 3 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.9
# To update, run:
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# ./bin/compile_dependencies.sh
#
Expand Down Expand Up @@ -230,7 +230,7 @@ pytz==2022.2.1
# babel
# django
# drf-yasg
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/base.txt
# gemma-zds-client
Expand Down
6 changes: 3 additions & 3 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.9
# To update, run:
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# ./bin/compile_dependencies.sh
#
Expand Down Expand Up @@ -230,7 +230,7 @@ pytz==2022.2.1
# babel
# django
# drf-yasg
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/base.txt
# gemma-zds-client
Expand Down
6 changes: 3 additions & 3 deletions requirements/production.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.9
# To update, run:
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# ./bin/compile_dependencies.sh
#
Expand Down Expand Up @@ -192,7 +192,7 @@ pytz==2022.2.1
# babel
# django
# drf-yasg
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements/base.txt
# gemma-zds-client
Expand Down
Loading