Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS
Commits
9c520f2b
Commit
9c520f2b
authored
2 years ago
by
Tom Teichler
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix-release-2022.6' into 'master'
Fix dependency on aleksis-core See merge request
AlekSIS/official/AlekSIS!177
parents
9a55eacc
c9ebe189
No related branches found
No related tags found
1 merge request
!177
Fix dependency on aleksis-core
Pipeline
#83899
failed
2 years ago
Stage: build
Stage: publish
Stage: docker
Stage: integration
Changes
3
Pipelines
17
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+1
-1
1 addition, 1 deletion
Dockerfile
meta/aleksis-builddeps/pyproject.toml
+1
-1
1 addition, 1 deletion
meta/aleksis-builddeps/pyproject.toml
meta/aleksis/pyproject.toml
+2
-2
2 additions, 2 deletions
meta/aleksis/pyproject.toml
with
4 additions
and
4 deletions
Dockerfile
+
1
−
1
View file @
9c520f2b
ARG
APPS="AlekSIS==2022.6"
ARG
APPS="AlekSIS==2022.6
.post1
"
ARG
BUILD_DEPS="libmariadb-dev gcc python3-dev"
ARG
SYSTEM_DEPS="default-mysql-client-core"
...
...
This diff is collapsed.
Click to expand it.
meta/aleksis-builddeps/pyproject.toml
+
1
−
1
View file @
9c520f2b
[tool.poetry]
name
=
"AlekSIS-Builddeps"
version
=
"2022.6.
1.dev0
"
version
=
"2022.6.
post1
"
packages
=
[]
description
=
"AlekSIS (School Information System) — Build/Dev dependencies for apps"
...
...
This diff is collapsed.
Click to expand it.
meta/aleksis/pyproject.toml
+
2
−
2
View file @
9c520f2b
[tool.poetry]
name
=
"AlekSIS"
version
=
"2022.6.
1.dev0
"
version
=
"2022.6.
post1
"
packages
=
[
{
include
=
"aleksis_meta"
}
]
include
=
[
"LICNECE.rst"
]
readme
=
"README.rst"
...
...
@@ -22,7 +22,7 @@ classifiers = [
]
[tool.poetry.dependencies]
aleksis-core
=
{
version
=
"~2.
9
"
,
extras
=
[
"ldap"
,
"s3"
,
"sentry"
]}
aleksis-core
=
{
version
=
"~2.
10
"
,
extras
=
[
"ldap"
,
"s3"
,
"sentry"
]}
aleksis-app-alsijil
=
"~2.1"
aleksis-app-chronos
=
"~2.4"
aleksis-app-csvimport
=
"~2.3"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment