Skip to content

Commit b9ead83

Browse files
authored
Drop doc build tester
Merge pull request #1145 from openfisca/drop-make-test-doc
2 parents e18f23b + 4f4d52d commit b9ead83

7 files changed

Lines changed: 11 additions & 176 deletions

File tree

.github/workflows/workflow.yml

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -120,36 +120,6 @@ jobs:
120120
- name: Check NumPy typing against latest 3 minor versions
121121
run: for i in {1..3}; do VERSION=$(${GITHUB_WORKSPACE}/.github/get-numpy-version.py prev) && pip install numpy==$VERSION && make check-types; done
122122

123-
test-docs:
124-
runs-on: ubuntu-latest
125-
needs: [ build ]
126-
env:
127-
TERM: xterm-256color
128-
steps:
129-
- uses: actions/checkout@v2
130-
- name: Checkout docs
131-
run: make test-doc-checkout branch=${GITHUB_REF#refs/heads/}
132-
- name: Set up Python
133-
uses: actions/setup-python@v2
134-
with:
135-
python-version: 3.7.12
136-
- name: Cache build
137-
id: restore-build
138-
uses: actions/cache@v2
139-
with:
140-
path: ${{ env.pythonLocation }}
141-
key: build-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ github.sha }}
142-
- name: Cache docs
143-
id: restore-docs
144-
uses: actions/cache@v2
145-
with:
146-
path: ${{ env.pythonLocation }}
147-
key: docs-${{ env.pythonLocation }}-${{ hashFiles('doc/requirements.txt') }}--${{ github.sha }}
148-
- name: Install dependencies
149-
run: make test-doc-install
150-
- name: Run doc tests
151-
run: make test-doc-build
152-
153123
lint-files:
154124
runs-on: ubuntu-latest
155125
needs: [ build ]
@@ -174,7 +144,7 @@ jobs:
174144

175145
check-version:
176146
runs-on: ubuntu-latest
177-
needs: [ test-core, test-country-template, test-extension-template, check-numpy, test-docs, lint-files ] # Last job to run
147+
needs: [ test-core, test-country-template, test-extension-template, check-numpy, lint-files ] # Last job to run
178148
steps:
179149
- uses: actions/checkout@v2
180150
with:

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
### 35.8.6 [#1145](https://github.com/openfisca/openfisca-core/pull/1145)
4+
5+
#### Technical changes
6+
7+
- Removes the automatic documentation build check
8+
- It has been proven difficult to maintain, specifically due _dependency hell_ and a very contrived build workflow.
9+
310
### 35.8.5 [#1137](https://github.com/openfisca/openfisca-core/pull/1137)
411

512
#### Technical changes

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ include openfisca_tasks/lint.mk
33
include openfisca_tasks/publish.mk
44
include openfisca_tasks/serve.mk
55
include openfisca_tasks/test_code.mk
6-
include openfisca_tasks/test_doc.mk
76

87
## To share info with the user, but no action is needed.
98
print_info = $$(tput setaf 6)[i]$$(tput sgr0)

README.md

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -135,70 +135,6 @@ OpenFisca’s toolchain checks whether documentation builds correctly and update
135135

136136
In the meantime, please take a look at our [contributing guidelines](CONTRIBUTING.md) for some general tips on how to document your contributions, and at our official documentation's [repository](https://github.com/openfisca/openfisca-doc/blob/master/README.md) to in case you want to know how to build it by yourself —and improve it!
137137

138-
### To verify that the documentation still builds correctly
139-
140-
You can run:
141-
142-
```sh
143-
make test-doc
144-
```
145-
146-
### If it doesn't, or if the doc is already broken.
147-
148-
Here's how you can fix it:
149-
150-
1. Clone the documentation, if not yet done:
151-
152-
```
153-
make test-doc-checkout
154-
```
155-
156-
2. Install the documentation's dependencies, if not yet done:
157-
158-
```
159-
make test-doc-install
160-
```
161-
162-
3. Create a branch, both in core and in the doc, to correct the problems:
163-
164-
```
165-
git checkout -b fix-doc
166-
sh -c "cd doc && git checkout -b `git branch --show-current`"
167-
```
168-
169-
4. Fix the offending problems —they could be in core, in the doc, or both.
170-
171-
You can test-drive your fixes by checking that each change works as expected:
172-
173-
```
174-
make test-doc-build branch=`git branch --show-current`
175-
```
176-
177-
5. Commit at each step, so you don't accidentally lose your progress:
178-
179-
```
180-
git add -A && git commit -m "Fix outdated argument for Entity"
181-
sh -c "cd doc && git add -A && git commit -m \"Fix outdated argument for Entity\""
182-
```
183-
184-
6. Once you're done, push your changes and cleanup:
185-
186-
```
187-
git push origin `git branch --show-current`
188-
sh -c "cd doc && git push origin `git branch --show-current`"
189-
rm -rf doc
190-
```
191-
192-
7. Finally, open a pull request both in [core](https://github.com/openfisca/openfisca-core/compare/master...fix-doc) and in the [doc](https://github.com/openfisca/openfisca-doc/compare/master...fix-doc).
193-
194-
Continuous integration will automatically try to build the documentation from the same branch in both core and the doc (in our example "fix-doc") so we can integrate first our changes to Core, and then our changes to the doc.
195-
196-
If no changes were needed to the doc, then your changes to core will be verified against the production version of the doc.
197-
198-
If your changes concern only the doc, please take a look at the doc's [README](https://github.com/openfisca/openfisca-doc/blob/master/README.md).
199-
200-
That's it! 🙌
201-
202138
## Serving the API
203139

204140
OpenFisca-Core provides a Web-API. It is by default served on the `5000` port.

openfisca_tasks/install.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
install:
33
@$(call print_help,$@:)
44
@pip install --upgrade pip twine wheel
5-
@pip install --editable ".[dev]" --upgrade --use-deprecated=legacy-resolver
5+
@pip install --editable ".[dev]" --upgrade
66

77
## Uninstall project dependencies.
88
uninstall:

openfisca_tasks/test_doc.mk

Lines changed: 0 additions & 78 deletions
This file was deleted.

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,13 @@
4242
'mypy == 0.910',
4343
'openfisca-country-template >= 3.10.0, < 4.0.0',
4444
'openfisca-extension-template >= 1.2.0rc0, < 2.0.0',
45+
'pycodestyle >= 2.8.0, < 2.9.0',
4546
'pylint == 2.10.2',
4647
] + api_requirements
4748

4849
setup(
4950
name = 'OpenFisca-Core',
50-
version = '35.8.5',
51+
version = '35.8.6',
5152
author = 'OpenFisca Team',
5253
author_email = 'contact@openfisca.org',
5354
classifiers = [

0 commit comments

Comments
 (0)