From 85cdd960f004d9fcad2247c270859efd1a73619a Mon Sep 17 00:00:00 2001 From: Stefan Appelhoff Date: Thu, 18 Jun 2020 11:46:14 +0200 Subject: [PATCH 1/3] make circle artifact link a GH action, point to pdf --- .circleci/artifact_path | 1 - .github/workflows/main.yml | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) delete mode 100644 .circleci/artifact_path create mode 100644 .github/workflows/main.yml diff --git a/.circleci/artifact_path b/.circleci/artifact_path deleted file mode 100644 index 6f3bd95cdc..0000000000 --- a/.circleci/artifact_path +++ /dev/null @@ -1 +0,0 @@ -0/site/01-introduction.html diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..89d968c8e9 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,12 @@ +on: [status] +jobs: + circleci_artifacts_redirector_job: + runs-on: ubuntu-latest + name: Run CircleCI artifacts redirector + steps: + - name: GitHub Action step + uses: larsoner/circleci-artifacts-redirector-action@master + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + artifact-path: 0/bids-spec.pdf + circleci-jobs: build_docs_pdf From 0c9ee435fb4103c3cbb7999c4637b3fff3ce9ffb Mon Sep 17 00:00:00 2001 From: Stefan Appelhoff Date: Wed, 1 Jul 2020 21:14:44 +0200 Subject: [PATCH 2/3] dont rely on pipenv in circleci build --- .circleci/config.yml | 21 ++++----------------- requirements.txt | 6 ++++-- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 483269e7ce..80ec008153 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,29 +2,16 @@ version: 2 jobs: build_docs: docker: - - image: circleci/python:3.6.6 + - image: circleci/python:3.8 steps: - checkout - - run: sudo chown -R circleci:circleci /usr/local/bin - - run: sudo chown -R circleci:circleci /usr/local/lib/python3.6/site-packages - - restore_cache: # ensure this step occurs *before* installing dependencies - key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} - run: command: | - sudo pip install pip==18.0 - sudo pip install pipenv==2018.7.1 - pipenv install - - save_cache: - key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }} - paths: - - ".venv" - - "/usr/local/bin" - - "/usr/local/lib/python3.6/site-packages" + pip install --upgrade pip + pip install -r requirements.txt - run: name: generate docs - command: pipenv run mkdocs build --clean --strict --verbose - - store_artifacts: - path: site + command: mkdocs build --clean --strict --verbose - persist_to_workspace: root: . paths: site diff --git a/requirements.txt b/requirements.txt index 2a3a761db3..13bb8180f9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,4 @@ -mkdocs-material -mkdocs-branchcustomization-plugin ~= 0.1.3 +mkdocs>=1.1 +mkdocs-material>=5.4 +pymdown-extensions>=7.0.0 +mkdocs-branchcustomization-plugin~=0.1.3 From 1bc5f343b04eb2fac140b9c1bf16abc006f9db68 Mon Sep 17 00:00:00 2001 From: Stefan Appelhoff Date: Wed, 1 Jul 2020 21:18:51 +0200 Subject: [PATCH 3/3] remove pipfile and pipfile.lock, bump rtd py ver --- Pipfile | 15 ---- Pipfile.lock | 177 ------------------------------------------------ readthedocs.yml | 2 +- 3 files changed, 1 insertion(+), 193 deletions(-) delete mode 100644 Pipfile delete mode 100644 Pipfile.lock diff --git a/Pipfile b/Pipfile deleted file mode 100644 index c84893295e..0000000000 --- a/Pipfile +++ /dev/null @@ -1,15 +0,0 @@ -[[source]] -url = "https://pypi.org/simple" -verify_ssl = true -name = "pypi" - -[packages] -mkdocs = "==1.0.4" -mkdocs-material = "==4.1.2" -pymdown-extensions = "==6.0.0" -mkdocs-branchcustomization-plugin = "~=0.1.3" - -[dev-packages] - -[requires] -python_version = "3.6" diff --git a/Pipfile.lock b/Pipfile.lock deleted file mode 100644 index 56a59462a6..0000000000 --- a/Pipfile.lock +++ /dev/null @@ -1,177 +0,0 @@ -{ - "_meta": { - "hash": { - "sha256": "921dc75c77c4cb90cd28e0f16e8bb3fe0ad35761c165c977a3219d888ce74b15" - }, - "pipfile-spec": 6, - "requires": { - "python_version": "3.6" - }, - "sources": [ - { - "name": "pypi", - "url": "https://pypi.org/simple", - "verify_ssl": true - } - ] - }, - "default": { - "click": { - "hashes": [ - "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13", - "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" - ], - "version": "==7.0" - }, - "gitdb2": { - "hashes": [ - "sha256:1b6df1433567a51a4a9c1a5a0de977aa351a405cc56d7d35f3388bad1f630350", - "sha256:96bbb507d765a7f51eb802554a9cfe194a174582f772e0d89f4e87288c288b7b" - ], - "version": "==2.0.6" - }, - "gitpython": { - "hashes": [ - "sha256:9c2398ffc3dcb3c40b27324b316f08a4f93ad646d5a6328cafbb871aa79f5e42", - "sha256:c155c6a2653593ccb300462f6ef533583a913e17857cfef8fc617c246b6dc245" - ], - "version": "==3.0.5" - }, - "jinja2": { - "hashes": [ - "sha256:74320bb91f31270f9551d46522e33af46a80c3d619f4a4bf42b3164d30b5911f", - "sha256:9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de" - ], - "version": "==2.10.3" - }, - "livereload": { - "hashes": [ - "sha256:78d55f2c268a8823ba499305dcac64e28ddeb9a92571e12d543cd304faf5817b", - "sha256:89254f78d7529d7ea0a3417d224c34287ebfe266b05e67e51facaf82c27f0f66" - ], - "version": "==2.6.1" - }, - "markdown": { - "hashes": [ - "sha256:2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a", - "sha256:56a46ac655704b91e5b7e6326ce43d5ef72411376588afa1dd90e881b83c7e8c" - ], - "version": "==3.1.1" - }, - "markupsafe": { - "hashes": [ - "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473", - "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", - "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", - "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", - "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", - "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", - "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", - "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", - "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", - "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", - "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", - "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", - "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", - "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", - "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905", - "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735", - "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d", - "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e", - "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d", - "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c", - "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21", - "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2", - "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5", - "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b", - "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", - "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", - "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", - "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7" - ], - "version": "==1.1.1" - }, - "mkdocs": { - "hashes": [ - "sha256:17d34329aad75d5de604b9ed4e31df3a4d235afefdc46ce7b1964fddb2e1e939", - "sha256:8cc8b38325456b9e942c981a209eaeb1e9f3f77b493ad755bfef889b9c8d356a" - ], - "index": "pypi", - "version": "==1.0.4" - }, - "mkdocs-branchcustomization-plugin": { - "hashes": [ - "sha256:b29ebe625b32be042f1ede935490134afac55962458be09bd2bcd746aa54fedf", - "sha256:c34b891a6ab1d8a19c81ac5e2fa1ea435bc17155e4dd733627bc7db98d933870" - ], - "index": "pypi", - "version": "==0.1.3" - }, - "mkdocs-material": { - "hashes": [ - "sha256:8a572f4b3358b9c0e11af8ae319ba4f3747ebb61e2393734d875133b0d2f7891", - "sha256:91210776db541283dd4b7beb5339c190aa69de78ad661aa116a8aa97dd73c803" - ], - "index": "pypi", - "version": "==4.1.2" - }, - "pygments": { - "hashes": [ - "sha256:2a3fe295e54a20164a9df49c75fa58526d3be48e14aceba6d6b1e8ac0bfd6f1b", - "sha256:98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe" - ], - "version": "==2.5.2" - }, - "pymdown-extensions": { - "hashes": [ - "sha256:25b0a7967fa697b5035e23340a48594e3e93acb10b06d74574218ace3347d1df", - "sha256:6cf0cf36b5a03b291ace22dc2f320f4789ce56fbdb6635a3be5fadbf5d7694dd" - ], - "index": "pypi", - "version": "==6.0" - }, - "pyyaml": { - "hashes": [ - "sha256:0e7f69397d53155e55d10ff68fdfb2cf630a35e6daf65cf0bdeaf04f127c09dc", - "sha256:2e9f0b7c5914367b0916c3c104a024bb68f269a486b9d04a2e8ac6f6597b7803", - "sha256:35ace9b4147848cafac3db142795ee42deebe9d0dad885ce643928e88daebdcc", - "sha256:38a4f0d114101c58c0f3a88aeaa44d63efd588845c5a2df5290b73db8f246d15", - "sha256:483eb6a33b671408c8529106df3707270bfacb2447bf8ad856a4b4f57f6e3075", - "sha256:4b6be5edb9f6bb73680f5bf4ee08ff25416d1400fbd4535fe0069b2994da07cd", - "sha256:7f38e35c00e160db592091751d385cd7b3046d6d51f578b29943225178257b31", - "sha256:8100c896ecb361794d8bfdb9c11fce618c7cf83d624d73d5ab38aef3bc82d43f", - "sha256:c0ee8eca2c582d29c3c2ec6e2c4f703d1b7f1fb10bc72317355a746057e7346c", - "sha256:e4c015484ff0ff197564917b4b4246ca03f411b9bd7f16e02a2f586eb48b6d04", - "sha256:ebc4ed52dcc93eeebeae5cf5deb2ae4347b3a81c3fa12b0b8c976544829396a4" - ], - "version": "==5.2" - }, - "six": { - "hashes": [ - "sha256:1f1b7d42e254082a9db6279deae68afb421ceba6158efa6131de7b3003ee93fd", - "sha256:30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66" - ], - "version": "==1.13.0" - }, - "smmap2": { - "hashes": [ - "sha256:0555a7bf4df71d1ef4218e4807bbf9b201f910174e6e08af2e138d4e517b4dde", - "sha256:29a9ffa0497e7f2be94ca0ed1ca1aa3cd4cf25a1f6b4f5f87f74b46ed91d609a" - ], - "version": "==2.0.5" - }, - "tornado": { - "hashes": [ - "sha256:349884248c36801afa19e342a77cc4458caca694b0eda633f5878e458a44cb2c", - "sha256:398e0d35e086ba38a0427c3b37f4337327231942e731edaa6e9fd1865bbd6f60", - "sha256:4e73ef678b1a859f0cb29e1d895526a20ea64b5ffd510a2307b5998c7df24281", - "sha256:559bce3d31484b665259f50cd94c5c28b961b09315ccd838f284687245f416e5", - "sha256:abbe53a39734ef4aba061fca54e30c6b4639d3e1f59653f0da37a0003de148c7", - "sha256:c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9", - "sha256:c9399267c926a4e7c418baa5cbe91c7d1cf362d505a1ef898fde44a07c9dd8a5" - ], - "version": "==6.0.3" - } - }, - "develop": {} -} diff --git a/readthedocs.yml b/readthedocs.yml index 59d9418a9e..f8ded24aa3 100644 --- a/readthedocs.yml +++ b/readthedocs.yml @@ -6,7 +6,7 @@ build: image: latest python: - version: 3.6 + version: 3.8 install: - requirements: requirements.txt