Skip to content

Commit

Permalink
Merge pull request #12 from nens/brostar
Browse files Browse the repository at this point in the history
renamed project to brostar
  • Loading branch information
JJFlorian authored Mar 22, 2024
2 parents 84e0773 + 63ef581 commit 74ec3a5
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions .nens.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
is_python_project = true
uses_ansible = false
meta_version = "0.5.dev0"
project_name = "bro-hub"
package_name = "bro_hub"
project_name = "brostar"
package_name = "brostar"
extra_package_names = ["api", "gmn", "gmw"]
minimum_coverage = "10"
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Changelog for broHUB
# Changelog for BROStar

## 0.1 (unreleased)

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# BRO-Hub
# BROStar

## Introductie

BRO-hub is een allomvattend product voor het datamanagement rondom de BRO. Het bestaat uit een API om zowel data uit de BRO te importeren als data naar de BRO op te sturen. De geimporteerde data wordt opgeslagen in een database en is via de API op te vragen.
BROStar is een allomvattend product voor het datamanagement rondom de BRO. Het bestaat uit een API om zowel data uit de BRO te importeren als data naar de BRO op te sturen. De geimporteerde data wordt opgeslagen in een database en is via de API op te vragen.

De backend is een Django applicatie, en de frontend (voorlopig) een Streamlit dashboard.

Expand Down Expand Up @@ -35,7 +35,7 @@ Some instructions:

Do the regular migrate, createsuperuser stuff.

TODO: start celery automatically (`celery -A bro_hub worker -l INFO -P solo`)
TODO: start celery automatically (`celery -A brostar worker -l INFO -P solo`)

7) Maak een organisatie, vul de KvK in

Expand Down
2 changes: 1 addition & 1 deletion api/bro_upload/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def add_xml_to_upload(
headers={"Content-Type": "application/xml"},
auth=(bro_username, bro_password),
data=xml_file,
params={"filename": "BROHub request"},
params={"filename": "BROStar request"},
)
r.raise_for_status()
return r.headers["Location"]
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions bro_hub/asgi.py → brostar/asgi.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
ASGI config for bro_hub project.
ASGI config for brostar project.
It exposes the ASGI callable as a module-level variable named ``application``.
Expand All @@ -11,6 +11,6 @@

from django.core.asgi import get_asgi_application

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bro_hub.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "brostar.settings")

application = get_asgi_application()
2 changes: 1 addition & 1 deletion bro_hub/celery.py → brostar/celery.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from celery import Celery

app = Celery("bro_hub")
app = Celery("brostar")

# Using a string here means the worker doesn't have to serialize
# the configuration object to child processes.
Expand Down
10 changes: 5 additions & 5 deletions bro_hub/settings.py → brostar/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"corsheaders.middleware.CorsMiddleware",
]

ROOT_URLCONF = "bro_hub.urls"
ROOT_URLCONF = "brostar.urls"

TEMPLATES = [
{
Expand Down Expand Up @@ -95,7 +95,7 @@
},
}

WSGI_APPLICATION = "bro_hub.wsgi.application"
WSGI_APPLICATION = "brostar.wsgi.application"

CORS_ALLOWED_ORIGINS = [
"http://localhost:4200",
Expand All @@ -106,9 +106,9 @@
DATABASES = {
"default": {
"ENGINE": "django.db.backends.postgresql",
"NAME": "bro_hub",
"USER": "bro_hub",
"PASSWORD": "bro_hub",
"NAME": "brostar",
"USER": "brostar",
"PASSWORD": "brostar",
"HOST": "db",
}
}
Expand Down
4 changes: 2 additions & 2 deletions bro_hub/urls.py → brostar/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
URL configuration for bro_hub project.
URL configuration for brostar project.
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/5.0/topics/http/urls/
Expand Down Expand Up @@ -29,7 +29,7 @@

schema_view = get_schema_view(
openapi.Info(
title="BROHub API",
title="BROStar API",
default_version="v1",
description="Simplify the data management of the BRO",
terms_of_service="",
Expand Down
4 changes: 2 additions & 2 deletions bro_hub/wsgi.py → brostar/wsgi.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
WSGI config for bro_hub project.
WSGI config for brostar project.
It exposes the WSGI callable as a module-level variable named ``application``.
Expand All @@ -11,6 +11,6 @@

from django.core.wsgi import get_wsgi_application

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bro_hub.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "brostar.settings")

application = get_wsgi_application()
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ services:
db:
image: postgis/postgis:14-3.4
environment:
POSTGRES_USER: 'bro_hub'
POSTGRES_PASSWORD: 'bro_hub'
POSTGRES_DB: 'bro_hub'
POSTGRES_USER: 'brostar'
POSTGRES_PASSWORD: 'brostar'
POSTGRES_DB: 'brostar'
volumes:
- pgdata:/var/lib/postgresql/data
restart: unless-stopped
Expand All @@ -19,10 +19,10 @@ services:

celery:
environment:
- DJANGO_SETTINGS_MODULE=bro_hub.settings
- DJANGO_SETTINGS_MODULE=brostar.settings
- FIELD_ENCRYPTION_KEY="DUMMY-NEEDS-PROD-SETTING-Xgb1GczqZe909UMNc4=
build: .
command: celery -A bro_hub worker --loglevel=INFO
command: celery -A brostar worker --loglevel=INFO
volumes:
- .:/code
links:
Expand Down
2 changes: 1 addition & 1 deletion manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

def main():
"""Run administrative tasks."""
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bro_hub.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "brostar.settings")

try:
from django.core.management import execute_from_command_line
Expand Down
12 changes: 6 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
requires = ["setuptools>=69"]

[project]
name = "bro-hub"
name = "brostar"
requires-python = ">=3.11"
dependencies = []
description = "Simplify data management for BRO"
Expand All @@ -16,16 +16,16 @@ version = "0.1.dev0"
test = ["pytest"] # pytest added by nens-meta

[tool.setuptools]
packages = ["bro_hub", "api", "gmn", "gmw"]
packages = ["brostar", "api", "gmn", "gmw"]

[tool.pytest.ini_options]
testpaths = ["bro_hub", "api", "gmn", "gmw"]
testpaths = ["brostar", "api", "gmn", "gmw"]
log_level = "DEBUG"
django_find_project = false
DJANGO_SETTINGS_MODULE = "bro_hub.settings"
DJANGO_SETTINGS_MODULE = "brostar.settings"

[tool.coverage.run]
source = ["bro_hub", "api", "gmn", "gmw"]
source = ["brostar", "api", "gmn", "gmw"]

[tool.coverage.report]
show_missing = true
Expand All @@ -41,4 +41,4 @@ select = ["E4", "E7", "E9", "F", "I", "UP", "C901"]
release = false

[tool.pyright]
include = ["bro_hub", "api", "gmn", "gmw"]
include = ["brostar", "api", "gmn", "gmw"]

0 comments on commit 74ec3a5

Please sign in to comment.