Skip to content
Snippets Groups Projects
Verified Commit b9d32516 authored by mirabilos's avatar mirabilos Committed by mirabilos
Browse files

Prepare renaming BiscuIT-ng to AlekSIS Core

parent 5f514df9
No related branches found
No related tags found
1 merge request!90Rename BiscuIT-ng to AlekSIS
Showing
with 38 additions and 50 deletions
......@@ -62,8 +62,8 @@ docs/_build/
*.aux
# Generated files
biscuit/node_modules/
biscuit/static/
aleksis/node_modules/
aleksis/static/
.coverage
.mypy_cache/
......
......@@ -92,7 +92,7 @@ deploy_demo-master:
stage: deploy
environment:
name: demo/master
url: http://demo-master.biscuit-sis.org
url: http://demo-master.aleksis.org
before_script:
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
- eval $(ssh-agent -s)
......@@ -102,18 +102,18 @@ deploy_demo-master:
- echo "$SSH_KNOWN_HOSTS" >~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
script:
- grep -v "build:" docker-compose.yml | ssh root@demo-master.biscuit-sis.org
env BISCUIT_IMAGE_TAG=${CI_COMMIT_REF_NAME}
- grep -v "build:" docker-compose.yml | ssh root@demo-master.aleksis.org
env ALEKSIS_IMAGE_TAG=${CI_COMMIT_REF_NAME}
docker-compose
-p biscuit-${CI_ENVIRONMENT_SLUG}
-p aleksis-${CI_ENVIRONMENT_SLUG}
-f /dev/stdin
pull
- grep -v "build:" docker-compose.yml | ssh root@demo-master.biscuit-sis.org
env BISCUIT_IMAGE_TAG=${CI_COMMIT_REF_NAME}
- grep -v "build:" docker-compose.yml | ssh root@demo-master.aleksis.org
env ALEKSIS_IMAGE_TAG=${CI_COMMIT_REF_NAME}
NGINX_HTTP_PORT=80
BISCUIT_maintenance__debug=true
ALEKSIS_maintenance__debug=true
docker-compose
-p biscuit-${CI_ENVIRONMENT_SLUG}
-p aleksis-${CI_ENVIRONMENT_SLUG}
-f /dev/stdin
up -d
only:
......
[submodule "apps/official/BiscuIT-App-Exlibris"]
path = apps/official/BiscuIT-App-Exlibris
url = https://edugit.org/BiscuIT/BiscuIT-App-Exlibris
ignore = untracked
[submodule "apps/official/BiscuIT-App-Chronos"]
path = apps/official/BiscuIT-App-Chronos
url = https://edugit.org/BiscuIT/BiscuIT-App-Chronos
ignore = untracked
[submodule "apps/official/BiscuIT-App-Untis"]
path = apps/official/BiscuIT-App-Untis
url = https://edugit.org/BiscuIT/BiscuIT-App-Untis
ignore = untracked
[submodule "apps/official/BiscuIT-App-SchILD-NRW"]
path = apps/official/BiscuIT-App-SchILD-NRW
url = https://edugit.org/BiscuIT/BiscuIT-App-SchILD-NRW
ignore = untracked
[submodule "apps/official/BiscuIT-App-Alsijil"]
path = apps/official/BiscuIT-App-Alsijil
url = https://edugit.org/BiscuIT/BiscuIT-App-Alsijil
ignore = untracked
......@@ -50,6 +50,6 @@ Minor changes
* Use bootstrap buttons everywhere
_`1.0a1`: https://edugit.org/Teckids/BiscuIT/BiscuIT-ng/-/tags/1.0a1
_`1.0a2`: https://edugit.org/Teckids/BiscuIT/BiscuIT-ng/-/tags/1.0a2
_`1.0a4`: https://edugit.org/Teckids/BiscuIT/BiscuIT-ng/-/tags/1.0a4
_`1.0a1`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/1.0a1
_`1.0a2`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/1.0a2
_`1.0a4`: https://edugit.org/Teckids/AlekSIS/AlekSIS/-/tags/1.0a4
Development principles and contribution guidelines
==================================================
In order to create a high-quality software product, the BiscuIT developers
In order to create a high-quality software product, the AlekSIS developers
have agreed upon fundamental principles governing the code layout, coding
style and repository management for BiscuIT and all official apps.
style and repository management for AlekSIS and all official apps.
Coding layout and style
......@@ -23,8 +23,8 @@ decisions:
1. Standard library imports
2. Django imports
3. Third-party imports
4. Imports from BiscuIT core and other apps (absolute imports)
5. Imports from the same BiscuIT app (realtive imports)
4. Imports from AlekSIS core and other apps (absolute imports)
5. Imports from the same AlekSIS app (realtive imports)
Use `isort` to take care of this
......@@ -77,7 +77,7 @@ Manifestos governing development
The FOSS community has created some manifestos describing several aspects of
software development, to agree upon a baseline for these aspects. The
BiscuIT developers have agreed to adhere to the following manifestos:
AlekSIS developers have agreed to adhere to the following manifestos:
- The `Sane software manifesto`_
- The `Accessibility Manifesto`_
......@@ -96,7 +96,7 @@ The case on supporting non-free services
Defined by the `Free Software Definition`_, it is an essential freedom to
be allowed to use free software for any purpose, without limitation. Thus,
interoperability with non-free services shall not be ruled out, and the
BiscuIT project explicitly welcomes implementing support for
AlekSIS project explicitly welcomes implementing support for
interoperability with non-free services.
However, to purposefullt foster free software and services, if
......
......@@ -8,9 +8,9 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK 1
ENV PIP_NO_CACHE_DIR 1
# Configure app settings for build and runtime
ENV BISCUIT_static__root /var/lib/biscuit/static
ENV BISCUIT_media__root /var/lib/biscuit/media
ENV BISCUIT_backup__location /var/lib/biscuit/backups
ENV ALEKSIS_static__root /var/lib/aleksis/static
ENV ALEKSIS_media__root /var/lib/aleksis/media
ENV ALEKSIS_backup__location /var/lib/aleksis/backups
# Install necessary Debian packages for build and runtime
RUN apt-get -y update && \
......@@ -33,9 +33,9 @@ RUN eatmydata pip install poetry; \
eatmydata pip install gunicorn
# Install core
COPY biscuit ./biscuit/
COPY aleksis ./aleksis/
COPY LICENCE README.rst manage.py ./
RUN mkdir -p /var/lib/biscuit/media /var/lib/biscuit/static /var/lib/biscuit/backups; \
RUN mkdir -p /var/lib/aleksis/media /var/lib/aleksis/static /var/lib/aleksis/backups; \
poetry build && eatmydata pip install dist/*.whl
# Build messages and assets
......@@ -56,7 +56,7 @@ RUN eatmydata apt-get remove --purge -y \
rm -rf /root/.cache
# Declare a persistent volume for all data
VOLUME /var/lib/biscuit
VOLUME /var/lib/aleksis
# Define entrypoint and gunicorn running on port 8000
EXPOSE 8000
......
......@@ -2,7 +2,7 @@ include CODE_OF_CONDUCT.rst
include CONTRIBUTING.rst
include LICENCE
include manage.py
recursive-include biscuit/core/static *
recursive-include biscuit/core/templates *
recursive-include biscuit/core/migrations *
recursive-include aleksis/core/static *
recursive-include aleksis/core/templates *
recursive-include aleksis/core/migrations *
recursive-include docs *
import pkg_resources
try:
__version__ = pkg_resources.get_distribution("BiscuIT-ng").version
__version__ = pkg_resources.get_distribution("AlekSIS").version
except Exception:
__version__ = "unknown"
default_app_config = "biscuit.core.apps.CoreConfig"
default_app_config = "aleksis.core.apps.CoreConfig"
File moved
File moved
......@@ -5,8 +5,8 @@ from .signals import clean_scss
class CoreConfig(AppConfig):
name = "biscuit.core"
verbose_name = "BiscuIT - The Free School Information System"
name = "aleksis.core"
verbose_name = "AlekSIS — The Free School Information System"
def ready(self) -> None:
clean_scss()
......
File moved
File moved
File moved
File moved
File moved
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