From 203a4cfc74dc38da753247a007e163010feee915 Mon Sep 17 00:00:00 2001
From: Geoffrey Arthaud <geoffrey.arthaud@developpement-durable.gouv.fr>
Date: Thu, 12 Oct 2023 17:44:39 +0200
Subject: [PATCH] Correct package conf
---
.gitignore | 3 +++
.gitlab-ci-local/.gitignore | 2 ++
.gitlab-ci.yml | 11 +++++------
MANIFEST.in | 2 +-
dsfr/MANIFEST.in | 2 +-
5 files changed, 12 insertions(+), 8 deletions(-)
create mode 100644 .gitlab-ci-local/.gitignore
diff --git a/.gitignore b/.gitignore
index d9c6141..6682536 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,6 @@ dsfr/utility/icons
node_modules
site
.idea
+public/
+.DS_Store
+
diff --git a/.gitlab-ci-local/.gitignore b/.gitlab-ci-local/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/.gitlab-ci-local/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7413fe6..00c58a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,22 +16,21 @@ build_and_deploy_gitlab:
- npm ci --cache .npm --prefer-offline
- pipenv run npm run build:prod
- pipenv run python -m build
- - TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token pipenv run python -m twine upload --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi dist/*
+ - TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token pipenv run python -m twine upload --skip-existing --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi dist/*
cache:
paths:
- .npm/
- .pipenv/
- rules:
- - if: ($CI_COMMIT_BRANCH == "main")
deploy_exemple_site:
image: python:3.11.6-bookworm
stage: package_test
script:
- - git clone --no-tags --single-branch --depth=1 ${CI_SERVER_URL}/pub/numeco/mkdocs-dsfr-exemple.git
+ - git clone --branch develop --single-branch --depth=1 ${CI_SERVER_URL}/pub/numeco/mkdocs-dsfr-exemple.git
- cd mkdocs-dsfr-exemple
- - pip install mkdocs-dsfr --index-url https://gitlab-forge.din.developpement-durable.gouv.fr/api/v4/projects/20363/packages/pypi/simple
- - mkdocs build --strict --verbose -d ../public
+ - pip install pipenv
+ - pipenv install --index gitlab mkdocs-dsfr
+ - pipenv run mkdocs build --strict --verbose -d ../public
artifacts:
paths:
- public
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
index dc7f2a1..4ec26c5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-recursive-include dsfr *.ico *.js *.css *.png *.html *.eot *.svg *.ttf *.woff *.webmanifest *.map *.woff2
+recursive-include dsfr *.ico *.js *.css *.png *.html *.eot *.svg *.ttf *.woff *.webmanifest *.map *.woff2 *.yml
recursive-exclude * __pycache__
recursive-exclude * *.py[co]
prune mkdocs
\ No newline at end of file
diff --git a/dsfr/MANIFEST.in b/dsfr/MANIFEST.in
index dc7f2a1..4ec26c5 100644
--- a/dsfr/MANIFEST.in
+++ b/dsfr/MANIFEST.in
@@ -1,4 +1,4 @@
-recursive-include dsfr *.ico *.js *.css *.png *.html *.eot *.svg *.ttf *.woff *.webmanifest *.map *.woff2
+recursive-include dsfr *.ico *.js *.css *.png *.html *.eot *.svg *.ttf *.woff *.webmanifest *.map *.woff2 *.yml
recursive-exclude * __pycache__
recursive-exclude * *.py[co]
prune mkdocs
\ No newline at end of file
--
GitLab