diff --git a/Taskfile.yml b/Taskfile.yml index d88e7458f..32f7f0307 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -13,14 +13,6 @@ tasks: cmds: - echo "See all available tasks with {{.TASK_LIST}}" silent: true - install: - desc: Install required dependencies - cmds: - - poetry install - changelog: - desc: Generate a changelog - cmds: - - poetry run towncrier dist: desc: Build tarballs for backend and frontend cmds: diff --git a/changes/__init__.py b/changes/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/changes/changelog.d/.gitkeep b/changes/changelog.d/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/changes/changelog.d/apache-template-fix.doc b/changes/changelog.d/apache-template-fix.doc deleted file mode 100644 index acfabe6da..000000000 --- a/changes/changelog.d/apache-template-fix.doc +++ /dev/null @@ -1 +0,0 @@ -Fixed the sample Apache configuration diff --git a/changes/changelog.d/swagger.bugfix b/changes/changelog.d/swagger.bugfix deleted file mode 100644 index 83518590d..000000000 --- a/changes/changelog.d/swagger.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix build script for documentation to properly deploy swagger diff --git a/changes/changelog.d/trailing-slashes.bugfix b/changes/changelog.d/trailing-slashes.bugfix deleted file mode 100644 index e4e8442b8..000000000 --- a/changes/changelog.d/trailing-slashes.bugfix +++ /dev/null @@ -1 +0,0 @@ -Make trailing slashes optional for all endpoints diff --git a/changes/template.md.j2 b/changes/template.md.j2 deleted file mode 100644 index 133566739..000000000 --- a/changes/template.md.j2 +++ /dev/null @@ -1,28 +0,0 @@ -## {{ versiondata.version }} ({{ versiondata.date }}) - -Upgrade instructions are available at https://funquail.laidback.moe/docs/administrator/upgrade/index.html - -{% for section, _ in sections.items() %} -{% if sections[section] %} -{% for category, val in definitions.items() if category in sections[section] %} -{{ definitions[category]['name'] }}: - -{% if definitions[category]['showcontent'] %} -{% for text in sections[section][category].keys() | sort() %} -- {{ text }} -{% endfor %} - -{% else %} - -- {{ sections[section][category][''] | join(', ') }} - -{% endif %} -{% if sections[section][category] | length == 0 %} -No significant changes. -{% else %} -{% endif %} -{% endfor %} -{% else %} -No significant changes. -{% endif %} -{% endfor %} diff --git a/dev.yml b/dev.yml deleted file mode 100644 index 444ec82b6..000000000 --- a/dev.yml +++ /dev/null @@ -1,197 +0,0 @@ -version: "3" - -services: - front: - build: - context: front - dockerfile: Dockerfile.dev - env_file: - - .env.dev - - .env - environment: - - "HOST=0.0.0.0" - - "VUE_PORT=${VUE_PORT-8080}" - ports: - - "${VUE_PORT-8080}" - volumes: - - "./front:/app" - - "/app/node_modules" - - "./po:/po" - networks: - - internal - command: "yarn dev --host" - - postgres: - env_file: - - .env.dev - - .env - image: postgres:${POSTGRES_VERSION-11}-alpine - environment: - - "POSTGRES_HOST_AUTH_METHOD=trust" - command: postgres ${POSTGRES_ARGS-} - volumes: - - "./data/${COMPOSE_PROJECT_NAME-node1}/postgres:/var/lib/postgresql/data" - networks: - - internal - - redis: - env_file: - - .env.dev - - .env - image: redis:7-alpine - volumes: - - "./data/${COMPOSE_PROJECT_NAME-node1}/redis:/data" - networks: - - internal - - api: - env_file: - - .env.dev - - .env - build: - context: ./api - dockerfile: Dockerfile - args: - install_dev_deps: 1 - image: funkwhale-api - command: > - bash -c "funkwhale-manage collectstatic --no-input - && uvicorn --reload config.asgi:application --host 0.0.0.0 --port 5000 --reload-dir config/ --reload-dir=funkwhale_api/" - volumes: - - ./api:/app - - "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro" - - "./data/plugins:/srv/funkwhale/plugins" - - "./data/staticfiles:/staticfiles" - - "./data/media:/data/media" - environment: - - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-localhost}" - - "FUNKWHALE_HOSTNAME_SUFFIX=funkwhale.test" - - "FUNKWHALE_HOSTNAME_PREFIX=${COMPOSE_PROJECT_NAME}" - - "FUNKWHALE_PROTOCOL=${FUNKWHALE_PROTOCOL-http}" - - "DATABASE_URL=postgresql://postgres@postgres/postgres" - - "CACHE_URL=redis://redis:6379/0" - - "STATIC_ROOT=/staticfiles" - - depends_on: - - postgres - # - minio - - redis - networks: - - internal - cap_add: - - SYS_PTRACE - extra_hosts: - - "node1.funkwhale.test:172.17.0.1" - - "node2.funkwhale.test:172.17.0.1" - - "node3.funkwhale.test:172.17.0.1" - - celeryworker: - env_file: - - .env.dev - - .env - image: funkwhale-api - depends_on: - - postgres - # - minio - - redis - command: celery -A funkwhale_api.taskapp worker -l debug -B --concurrency=${CELERYD_CONCURRENCY-0} - environment: - - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-localhost}" - - "FUNKWHALE_HOSTNAME_SUFFIX=funkwhale.test" - - "FUNKWHALE_HOSTNAME_PREFIX=${COMPOSE_PROJECT_NAME}" - - "FUNKWHALE_PROTOCOL=${FUNKWHALE_PROTOCOL-http}" - - "DATABASE_URL=postgresql://postgres@postgres/postgres" - - "CACHE_URL=redis://redis:6379/0" - volumes: - - ./api:/app - - "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro" - - "./data/plugins:/srv/funkwhale/plugins" - - "./data/media:/data/media" - networks: - - internal - extra_hosts: - - "node1.funkwhale.test:172.17.0.1" - - "node2.funkwhale.test:172.17.0.1" - - "node3.funkwhale.test:172.17.0.1" - - nginx: - env_file: - - .env.dev - - .env - image: nginx - ports: - - "${NGINX_PORTS_MAPPING-8000:80}" - environment: - - "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-100M}" - - "FUNKWHALE_API_IP=${FUNKHALE_API_IP-api}" - - "FUNKWHALE_API_PORT=${FUNKWHALE_API_PORT-5000}" - - "FUNKWHALE_FRONT_IP=${FUNKHALE_FRONT_IP-front}" - - "FUNKWHALE_FRONT_PORT=${VUE_PORT-8080}" - - "COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME- }" - - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-localhost}" - depends_on: - - api - - front - volumes: - - ./docker/nginx/conf.dev:/etc/nginx/templates/default.conf.template:ro - - "${MUSIC_DIRECTORY_SERVE_PATH-./data/music}:/music:ro" - - ./deploy/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro - - "./front:/frontend:ro" - - "./data/staticfiles:/staticfiles:ro" - - "./data/media:/protected/media:ro" - networks: - - federation - - internal - - labels: - traefik.backend: "${COMPOSE_PROJECT_NAME-node1}" - traefik.frontend.rule: "Host:${COMPOSE_PROJECT_NAME-node1}.funkwhale.test,${NODE_IP-127.0.0.1},${DJANGO_ALLOWED_HOSTS}" - traefik.enable: "true" - traefik.federation.protocol: "http" - traefik.federation.port: "80" - traefik.frontend.passHostHeader: true - traefik.docker.network: federation - - api-docs: - image: swaggerapi/swagger-ui:v3.37.2 - environment: - - "API_URL=/swagger.yml" - ports: - - "8002:8080" - volumes: - - "./docs/swagger.yml:/usr/share/nginx/html/swagger.yml" - - "./docs/api:/usr/share/nginx/html/api" - - typesense: - env_file: - - .env.dev - - .env - image: typesense/typesense:0.24.0 - networks: - - internal - volumes: - - ./typesense/data:/data - command: --data-dir /data --enable-cors - profiles: - - typesense - - # minio: - # image: minio/minio - # command: server /data - # volumes: - # - "./data/${COMPOSE_PROJECT_NAME-node1}/minio:/data" - # environment: - # - "MINIO_ACCESS_KEY=${AWS_ACCESS_KEY_ID-access_key}" - # - "MINIO_SECRET_KEY=${AWS_SECRET_ACCESS_KEY-secret_key}" - # - "MINIO_HTTP_TRACE: /dev/stdout" - # ports: - # - "9000:9000" - # networks: - # - federation - # - internal - -networks: - internal: - federation: - name: federation - external: true diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 86ff2bb79..000000000 --- a/pyproject.toml +++ /dev/null @@ -1,76 +0,0 @@ -[tool.towncrier] -package = "changes" -package_dir = "" -filename = "CHANGELOG.md" -directory = "changes/changelog.d" -start_string = "\n" -template = "changes/template.md.j2" -issue_format = "" -title_format = "" -underlines = [""] - -[[tool.towncrier.section]] -path = "" - -[[tool.towncrier.type]] -directory = "update" -name = "Update instructions" -showcontent = true - -[[tool.towncrier.type]] -directory = "feature" -name = "Features" -showcontent = true - -[[tool.towncrier.type]] -directory = "enhancement" -name = "Enhancements" -showcontent = true - -[[tool.towncrier.type]] -directory = "refactoring" -name = "Refactoring" -showcontent = true - -[[tool.towncrier.type]] -directory = "bugfix" -name = "Bugfixes" -showcontent = true - -[[tool.towncrier.type]] -directory = "doc" -name = "Documentation" -showcontent = true - -[[tool.towncrier.type]] -directory = "i18n" -name = "i18n" -showcontent = true - -[[tool.towncrier.type]] -directory = "misc" -name = "Other" -showcontent = true - -[[tool.towncrier.type]] -directory = "deprecation" -name = "Deprecation" -showcontent = true - -[[tool.towncrier.type]] -directory = "removal" -name = "Removal" -showcontent = true - -[tool.black] -extend-exclude = "(api/.*/migrations/.*)" -force-exclude = "(api/.*/migrations/.*)" # pre-commit pass files as args - -[tool.isort] -profile = "black" -extend_skip_glob = ["api/*/migrations/*"] -known_first_party = ["funquail_api", "config"] - -[tool.codespell] -ignore-words = ".codespellignore" -skip = "*.po,*.pot,*.lock,api/funquail_api/common/locales.py,front/src/locales/*.json"