From 1f0747e6c291ef0eb28b23eed904608b2102fab9 Mon Sep 17 00:00:00 2001 From: Brennan <brennanmk2200@gmail.com> Date: Wed, 19 Jul 2023 12:53:46 -0400 Subject: [PATCH 1/8] Auto deploy pages --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fd0fad..c61a6e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,10 +31,13 @@ auto-docs: - pip install . - cd docs - make latexpdf + - make html - mv _build/latex/ltcodecs.pdf .. + - mv _build/html ../public artifacts: paths: - - ltcodecs.pdf + - ltcodecs.pdf- + - public pypi: image: python -- GitLab From b6f9bfc78eb8287abb5bda96a4e310f54d758bd4 Mon Sep 17 00:00:00 2001 From: Brennan Miller-Klugman <millerklugmanb@wit.edu> Date: Wed, 19 Jul 2023 18:50:15 +0000 Subject: [PATCH 2/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c61a6e7..da69f27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ auto-docs: - mv _build/html ../public artifacts: paths: - - ltcodecs.pdf- + - ltcodecs.pdf - public pypi: -- GitLab From 67686b2b2a1943641870f5f8509e990cdeb54e82 Mon Sep 17 00:00:00 2001 From: Brennan <brennanmk2200@gmail.com> Date: Wed, 19 Jul 2023 14:58:20 -0400 Subject: [PATCH 3/8] Adjusted ci config --- .gitlab-ci.yml | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da69f27..58edff3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,27 +28,8 @@ auto-docs: stage: deploy script: - pip install -r requirements.txt - - pip install . - cd docs - - make latexpdf - - make html - - mv _build/latex/ltcodecs.pdf .. - - mv _build/html ../public + - sphinx-build -b html . ../public artifacts: paths: - - ltcodecs.pdf - - public - -pypi: - image: python - stage: deploy - script: - - pip install -r requirements.txt - - pip install build twine - - python -m build - - twine upload --username __token__ --password $PYPI_TOKEN dist/* - artifacts: - paths: - - dist/ - only: - - tags \ No newline at end of file + - public \ No newline at end of file -- GitLab From 985429ee56f6191aa3b4e8860dc71fee08497d93 Mon Sep 17 00:00:00 2001 From: Brennan <brennanmk2200@gmail.com> Date: Wed, 19 Jul 2023 15:00:20 -0400 Subject: [PATCH 4/8] Adjusted ci config --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58edff3..213aa1b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ test: - pip install . - python3 tests/test_codecs.py -auto-docs: +pages: image: ltcodecs-docs:latest stage: deploy script: -- GitLab From 343be8174990727b62b1b99c41431feeec032b34 Mon Sep 17 00:00:00 2001 From: Brennan <brennanmk2200@gmail.com> Date: Wed, 19 Jul 2023 15:06:26 -0400 Subject: [PATCH 5/8] Adjusted ci config --- .gitlab-ci.yml | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 213aa1b..7a944ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,13 +23,43 @@ test: - pip install . - python3 tests/test_codecs.py +auto-docs: + image: ltcodecs-docs:latest + stage: deploy + script: + - pip install -r requirements.txt + - pip install . + - cd docs + - make latexpdf + - mv _build/latex/ltcodecs.pdf .. + artifacts: + paths: + - ltcodecs.pdf + pages: image: ltcodecs-docs:latest stage: deploy script: - pip install -r requirements.txt + - pip install . - cd docs - sphinx-build -b html . ../public artifacts: paths: - - public \ No newline at end of file + - public + only: + - master + +pypi: + image: python + stage: deploy + script: + - pip install -r requirements.txt + - pip install build twine + - python -m build + - twine upload --username __token__ --password $PYPI_TOKEN dist/* + artifacts: + paths: + - dist/ + only: + - tags \ No newline at end of file -- GitLab From 53e8b72b498e90a4d03532da5e1929da57e7997f Mon Sep 17 00:00:00 2001 From: Brennan <brennanmk2200@gmail.com> Date: Wed, 19 Jul 2023 15:07:56 -0400 Subject: [PATCH 6/8] Adjusted ci config --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a944ae..4ce4b32 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,8 +47,6 @@ pages: artifacts: paths: - public - only: - - master pypi: image: python -- GitLab From 25f92427df9a10df27c41491d18413e427bb6b56 Mon Sep 17 00:00:00 2001 From: Brennan <brennanmk2200@gmail.com> Date: Wed, 19 Jul 2023 15:11:18 -0400 Subject: [PATCH 7/8] Adjusted ci config --- docs/auto-docs.Dockerfile | 3 ++- docs/conf.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/auto-docs.Dockerfile b/docs/auto-docs.Dockerfile index 2759294..2535f5e 100644 --- a/docs/auto-docs.Dockerfile +++ b/docs/auto-docs.Dockerfile @@ -25,4 +25,5 @@ RUN apt-get install --no-install-recommends -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* RUN pip install -U sphinx -RUN pip install -U pytest \ No newline at end of file +RUN pip install -U pytest +RUN pip install -U sphinxawesome-theme \ No newline at end of file diff --git a/docs/conf.py b/docs/conf.py index 069a46d..c288cdc 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -34,7 +34,7 @@ latex_elements = { # -- Options for HTML output ------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output - +html_theme = "sphinxawesome_theme" add_function_parentheses = True add_module_names = True -- GitLab From b613be09ef6493597d79d2b6eb339464e62d4af8 Mon Sep 17 00:00:00 2001 From: Brennan <brennanmk2200@gmail.com> Date: Wed, 19 Jul 2023 18:42:03 -0400 Subject: [PATCH 8/8] Adjusted ci config --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ce4b32..c40f6a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,6 +47,8 @@ pages: artifacts: paths: - public + only: + - tags pypi: image: python -- GitLab