Skip to content
Snippets Groups Projects
Commit 88d92354 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '317-separate-core-and-default-distribution' into 'master'

Remove submodules and rename project

See merge request !386
parents 96c4ff71 31d39889
No related branches found
No related tags found
1 merge request!386Remove submodules and rename project
Pipeline #4394 failed
......@@ -2,7 +2,6 @@ include:
- local: "/ci/general.yml"
- local: "/ci/test.yml"
- local: "/ci/build_dist.yml"
- local: "/ci/build_docker.yml"
- local: "/ci/pages.yml"
- local: "/ci/deploy_pypi.yml"
- local: "/ci/deploy.yml"
[submodule "apps/official/AlekSIS-App-Chronos"]
path = apps/official/AlekSIS-App-Chronos
url = https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos
ignore = untracked
[submodule "apps/official/AlekSIS-App-DashboardFeeds"]
path = apps/official/AlekSIS-App-DashboardFeeds
url = https://edugit.org/AlekSIS/Official/AlekSIS-App-DashboardFeeds
ignore = untracked
[submodule "apps/official/AlekSIS-App-LDAP"]
path = apps/official/AlekSIS-App-LDAP
url = https://edugit.org/AlekSIS/official/AlekSIS-App-LDAP
ignore = untracked
[submodule "apps/official/AlekSIS-App-Untis"]
path = apps/official/AlekSIS-App-Untis
url = https://edugit.org/AlekSIS/official/AlekSIS-App-Untis
ignore = untracked
[submodule "apps/official/AlekSIS-App-Hjelp"]
path = apps/official/AlekSIS-App-Hjelp
url = https://edugit.org/AlekSIS/official/AlekSIS-App-Hjelp
ignore = untracked
Subproject commit 0be06de63d5f56eab6f9c1e814a82c69c318ffd1
Subproject commit 1cf18722553a016b8a9165de556bb00329f10173
Subproject commit 0898d261d95df2079767cf58a316d4804a2e230e
Subproject commit 412631fb73abf30c931c3f1951def102720e3f51
Subproject commit 2f22b31c19a0bd7f479eac7f11d0943f8e297bae
......@@ -9,10 +9,10 @@ variables:
GIT_SUBMODULE_STRATEGY: recursive
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
FF_NETWORK_PER_BUILD: "true"
POETRY_REPOSITORIES_GITLAB_URL: "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/pypi"
POETRY_HTTP_BASIC_GITLAB_USERNAME: gitlab-ci-token
POETRY_HTTP_BASIC_GITLAB_PASSWORD: "$CI_JOB_TOKEN"
POETRY_PYPI_TOKEN_PYPI: "$PYPI_TOKEN"
POETRY_REPOSITORIES_GITLAB_URL: "$CI_API_V4_URL/projects/461/packages/pypi"
POETRY_HTTP_BASIC_GITLAB_USERNAME: aleksis
POETRY_HTTP_BASIC_GITLAB_PASSWORD: "$GITLAB_PUBLISH_TOKEN"
POETRY_PYPI_TOKEN_PYPI: "$GITLAB_PUBLISH_TOKEN"
cache:
key:
......
[tool.poetry]
name = "AlekSIS"
name = "AlekSIS-Core"
version = "2.0a3.dev0"
packages = [
{ include = "aleksis" }
......@@ -12,8 +12,8 @@ authors = ["Dominik George <dominik.george@teckids.org>", "Julian Leucker <leuck
maintainers = ["Jonathan Weth <wethjo@katharineum.de>", "Dominik George <dominik.george@teckids.org>"]
license = "EUPL-1.2-or-later"
homepage = "https://aleksis.org/"
repository = "https://edugit.org/AlekSIS/official/AlekSIS"
documentation = "https://aleksis.org/AlekSIS/docs/html/"
repository = "https://edugit.org/AlekSIS/official/AlekSIS-Core"
documentation = "https://aleksis.org/AlekSIS-Core/docs/html/"
keywords = ["SIS", "education", "school", "digitisation", "school apps"]
classifiers = [
"Development Status :: 3 - Alpha",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment