e226b60c7f
Merge remote-tracking branch 'matrix-org/master' into travis/s2s/transactions-swagger
6 years ago
3ff1b0ddea
Merge pull request #1389 from turt2live/travis/towncrier
...
Use Towncrier to generate the unstable changelog
6 years ago
98c607bff5
Advertise python 3.4 support and use that in Travis CI
...
We also don't need to update virtualenv, or use python3.5 specific
packages.
6 years ago
cfac4a1ab3
Use towncrier 18.6.0 final
6 years ago
e5da1e1741
Improve upon the transaction schema and examples
...
Reduces data duplication and makes the objects more reusable for other areas of the spec
6 years ago
8a4ba8c5ca
Use Popen rather than run()
6 years ago
af7460088f
Use six for url quoting
6 years ago
374ec00046
Convert things that mention "Transaction" to swagger
...
There's two kinds of transactions currently: one with EDUs and one without. The one with EDUs is only used on /send, however the schema is still somewhat worth splitting out for simplicity.
The examples are brought apart to make them slightly more reusable for when they get dumped into the relevant sections of the spec (see TODO in server_server_api.rst)
Further, the Transactions stuff introduces tuples to the spec. The units.py has been updated to support this.
6 years ago
a8461e647f
Improve the error handling for towncrier
...
The changelog shows up via stdout, everything else via stderr. We dump as much information as we can into the changelog to make debugging errors easier.
6 years ago
905ef6dadd
Have the towncrier generator complain if the output looks wrong
6 years ago
ebc7db12fb
Remove extraneous list casting
6 years ago
9e0fafbcd4
Remove debugging line
6 years ago
3a9cfd490f
Improve pagination handling in proposals.py
...
Previously if multiple pages were returned then the script would lose the results.
A check to ensure the response is an array was also added. This helps avoid somewhat cryptic errors when iterating over non-lists (eg: error messages, bad output, etc)
6 years ago
550f95570b
Fix regex for some versions of python
6 years ago
7ada960206
Fix the Travis CI build to work on 3.5
6 years ago
08f6912825
Ask Travis to install 3.5 explicitly
6 years ago
a4f8e0807a
Print the python version being used in the CI build.
6 years ago
63b926a4aa
Make Travis CI use python 3
6 years ago
c2f85788de
Add documentation about how to add to the changelog
6 years ago
9277e4c52d
Add initial towncrier support
6 years ago
f54d5a4039
Convert build scripts to python 3
6 years ago
1722734a51
Merge pull request #1364 from turt2live/travis/server-name-join
...
Document the server_name query parameter on /join/{roomIdOrAlias}
6 years ago
f9a0a49e96
Add a bunch more people to the speculator trusted list
6 years ago
4485b2f025
Merge branch 'master' into travis/server-name-join
6 years ago
8bd1fe9908
Merge pull request #1357 from turt2live/travis/fix-windows
...
Use filepath.To/FromSlash instead of manually replacing slashes
6 years ago
d02e9b875b
Merge pull request #1355 from matrix-org/benpa/travisci-ignore-proposals
...
don't run proposals.py step if in TravisCI environment
6 years ago
cbbdcbcf01
Show arrays in the query string as "[type]" rather than "array"
...
Otherwise the question "array of what?" is raised.
6 years ago
aac7b848f7
Add uhoreg and myself as trusted speculator people
6 years ago
a2e0d0382c
ignore emacs temporary files
...
and fix ignoring of dotfiles
6 years ago
85e1962f9c
Use filepath.To/FromSlash instead of manually replacing slashes
...
see https://github.com/matrix-org/matrix-doc/pull/1356#discussion_r199897557
6 years ago
eb21a71b70
Make the builder happier with Windows environments
...
There's two main issues with Windows environments:
* Slashes
* Windows still notifies about some directories we've ignored, therefore we need to filter them too
It's not super pretty, but it does work.
6 years ago
5803c9cace
don't run proposals.py step if in TravisCI environment
6 years ago
e52d94bea9
ignore malformed PR items
6 years ago
5ab5fe08d1
Small grammatical and stylistic fixes
6 years ago
0c1ba33eba
include proposals.py in matrix-doc CI
6 years ago
ee98082a60
update MSC1270
6 years ago
cb00fc35ab
git checkout master
7 years ago
d1c27349b2
Merge branch 'master' of https://github.com/matrix-org/matrix-doc
7 years ago
419bf1e52c
Fix continuserv instructions
...
As per f04b17f1c9
7 years ago
7a82a5d427
correct proposals.py
7 years ago
34090b24c4
prepare proposals.py for CI
7 years ago
663e1a5ebe
Update some text
7 years ago
73b28612ec
updates from feedback on pull
7 years ago
4d59abebf0
handle PR links from GitHub
7 years ago
d338f18927
handle EOF gracefully when searching for Authors and PRs
7 years ago
f1cc26dfd7
sort output by Created date per-table
7 years ago
b8f38b21a7
update introductory text
7 years ago
e87f1f2619
include PRs in tables
7 years ago
3b4e56c4e0
handle dd/mm/yyyy and yyyy-mm-dd dates in text
7 years ago
3b84de383c
cleanup and include all content
7 years ago
cbdd33a5f5
single authors and shepherds link correctly
7 years ago
73b7faddd4
handle multiple Google Docs
7 years ago
866b0b6348
I mostly play with ascii art
7 years ago
dc2b53318b
prettify ID column
7 years ago
a78f7b38e9
generator is now usable
7 years ago
c58dc59ffe
separate tables by label
7 years ago
1f7fbefd53
start using a table
7 years ago
e18aa30fd2
start generating new proposals page
7 years ago
f04b17f1c9
Fix path to fsnotify
...
Apparently this should be referred to as gopkg.in/fsnotify/fsnotify.v1. I'm not
sure what has changed to stop the old format working.
7 years ago
8e97ec8bad
make the speculator work for rick
7 years ago
9150ba0dce
Improve error output from failing to parse examples
7 years ago
a36bd1a6d2
Make build fail if gendoc fails
...
(cf https://github.com/matrix-org/matrix-doc/issues/1146 )
7 years ago
87d90ab58a
gendoc: improve title line matching
...
This makes it possible to include tables etc without the script trying to turn
them into titles.
7 years ago
1045bc721d
Document federation version endpoint
7 years ago
427e0bb83b
make jenkins and travis use a common script
7 years ago
202a265d85
Config for travis-ci
7 years ago
0cbf533625
Use petstore for continuserv swagger docs
...
Matrix.org's swagger browser is behind https, which means it can't read the
swagger from a continuserv on http. Use the petstore instead.
7 years ago
a38d4fc68e
Move templating into scripts dir
...
There's no real need for this to be at the top level.
7 years ago
e7772af5c3
Supporting-docs now in matrix.org repo.
7 years ago
cc6b16b63c
Generate the swagger for export
...
We may as well generate the unstable version of the C-S swagger.
7 years ago
d6f892f894
continuserv, speculator: update dump-swagger call
...
dump-swagger now expects -o before its output path
7 years ago
56c3e5a627
README.rst: Add notes on how to build the spec
7 years ago
834a3d78a8
Add a pip requirements file for the scripts
7 years ago
986c9d99a0
Improve arg parsing in dump-swagger
7 years ago
0dfff6b190
Simplify dump_swagger
...
We don't need most of the templating stuff. All we have to do is merge together
the swagger files, and resolve references.
7 years ago
2454598926
Speculator: include API docs links for branches
7 years ago
13d3293378
Fix version-extraction regexp
...
Fixes https://github.com/matrix-org/matrix-doc/issues/982
7 years ago
b0ea6038c6
Move jekyll back out of matrix-doc again
...
Having the jekyll assets here is a mistake, because they need to be versioned
separately to the spec: we keep old versions of the spec, but they sometimes
need to be restyled to match the latest website.
7 years ago
8a66b1a68b
Build the spec as part of the build
7 years ago
0af06291fe
Hardcode client major version r0
7 years ago
986e51cf35
Gendoc: allow overriding the dest dir
7 years ago
9d2a93ad7b
Run jekyll as part of the matrix-doc build
...
- this saves us having to run it manually on the web server.
7 years ago
934dd4754c
swagger-http-server: fix port param
...
it needs to be an int, not a list
8 years ago
2ec43a5948
Add continuserv index
...
Oops, forgot this when adding support for the API docs to continuserv in
bfb65d8
8 years ago
d41438605d
Use matrix.org for swagger UI
...
In the swagger UI, default to matrix.org rather than localhost, to make the UI
more useful.
8 years ago
bfb65d8ceb
Serve the API docs with continuserv
8 years ago
1320a86cbe
Serve the api docs from the speculator
...
There are a few parts to this:
* when we generate the spec for a particular git sha, also run the script which
turns our yaml api descriptions into a swagger json file.
* tweak serveSpec to add another header when serving the generated json.
* add a link to the generated index which will (via js hackery) redirect to our
hosted swagger UI at http://matrix.org/docs/api/client-server , with a "url"
query-param pointing at the generated json.
Also, factor makeTempDir out of gitClone, so that we can give clearer log lines.
8 years ago
459f4b953d
swagger-http-server: add a --port argument
8 years ago
1ea836bb1b
Remove howtos from build script
8 years ago
33d80408e0
Add a nix-shell environment suitable for building
...
This enables easy execution of scripts/*.py by Nix users.
Signed-off-by: Benjamin Saunders <ben.e.saunders@gmail.com>
8 years ago
49cd65dd58
Add a license to the spec
...
We're licensing hte spec under ASLv2. Add the LICENSE file, and add the
short-form to as much of the source as is practical right now (adding it to
json source is a massive pita).
8 years ago
b6c41727c5
Add PyYAML to scripts/README.md
...
PyYAML is a 3rd-party package used by `gendoc.py`.
9 years ago
8b61dab1c6
gendoc.py: add --list_targets arg
...
I want to be able to run all of the targets except one from matrix-doc, so make
a way to list the targets.
9 years ago
f46a2a7f2b
Include the basePath in the path in swagger output
...
This fixes both SPEC-393, and ORG-52.
9 years ago
8aa0f64665
Update the speculator to understand spec subdirs
...
Fix the speculator so that it doesn't blow up when it finds subdirs in the gen
directory.
(It doesn't handle the html diff very well in the case that the subdirs don't
match, but it's hard to do much about that)
9 years ago
01f8173c84
Put each bit of spec in its own directory
...
I want to change the URLs for the spec sections on the website from
<version>/<section>.html to <section>/<version>.html, to better reflect how we
do the versioning.
This puts each bit of spec in its own directory, updates the index to point to
the right place, and fixes continuserv to deal with directories as well as
files.
This will probably require fixes to the speculator too, but I'll have to come
back to that.
9 years ago
a8eed29e9f
gendoc: Allow multiple targets
9 years ago
7138205f31
Update README.md
...
escape angle-bracket to stop it getting lost in markdown
9 years ago
0546f0917d
Replace hacky shell to do matrix styling with hacky perl
...
Since the shell just wrapped three invocations of perl, we might as well do
it all in perl.
9 years ago
23c4ffbc1b
Add securityDefintions to generated swagger JSON
...
Also factor out to a common file
9 years ago
60f36bf868
Script to serve the generated swagger JSON
...
We need custom CORS headers to serve the swagger JSON, so add a script to do it
9 years ago
c39d797cce
Dump-swagger: take output file name rather than output dir
...
Make the argument to dump-swagger.py be the name of the output file rather than
the output dir, and give it a sensible default.
Also, use the absolute path to the output file, so that the output path is
relative to the user's cwd rather than the templating dir.
9 years ago
d6c1d1343b
Continuserv: Reduce number of watches
...
rather than trying to watch half the filesystem, be a bit more conservative in
what we put watches on. This means that we don't end up dying with "No space on
device" (thanks for that, Linux.)
9 years ago
072d285153
speculator: Allow access token to be specified
9 years ago
1f6c4d5bb2
Speed up gendoc.py by only running build.py once
9 years ago
aaeaa1dd98
Detect major version in presence of patch release
9 years ago
ad7874a730
Use site-relative stylesheet
9 years ago
60127de1e3
Take list of files to edit as args
9 years ago
a9b4f6fef0
Add missing _ to paths
9 years ago
db5cad4711
Remove accidentally committed change
9 years ago
99b8a066c8
Make dump-swagger work from all directories
9 years ago
1f5b6271f2
Generate swagger-ui output for client-server API
...
Depends on:
https://github.com/matrix-org/matrix-doc/pull/212
https://github.com/matrix-org/matrix-doc/pull/208
https://github.com/matrix-org/matrix-doc/pull/207
for the actual rendered output to not throw javascript errors at runtime.
9 years ago
d1d3d27e2f
Merge pull request #216 from matrix-org/rav/fix_speculator_redirects
...
Add a host and scheme to Location headers in redirects
9 years ago
f31a053995
Add a host and scheme to Location headers in redirects
...
Our apache reverse-proxy can't correctly rewrite relative Location headers, so
add the Host from the request into the Location.
9 years ago
78e04d662e
add moi :(
9 years ago
1b7548d460
Make the speculator serve the spec from drafts branches.
9 years ago
2f3a00fe34
Consistently spell homeserver as homeserver
9 years ago
1ce3357927
continuserv: serve multiple paths
9 years ago
97fd1fdd62
Embed client and server release numbers
...
Note that this also removes the changelog - I'm going to re-add the
changelog differently soon.
9 years ago
ebed3b60bd
Add trailing slashes to links
9 years ago
a4668c1d8c
Fix typo
9 years ago
c4eaf7458f
302 to spec/head/index.html rather than serving it on /spec/head
...
Otherwise relative links are broken
9 years ago
6c66bfc755
Flatten out v1 and v2_alpha directories
...
As a side effect, I got rid of all of the horrible symlinks and just put
in all of the proper relative paths. Because the horrible symlinks were
horrible.
9 years ago
e401d3e262
Merge pull request #184 from matrix-org/daniel/splitspec
...
Split spec into page-per-section
9 years ago
30ed918633
speculator: Allow spec viewing for multi-page spec
9 years ago
e171acf01f
Split spec into page-per-section
9 years ago
f0c99a6925
Generate API docs from swagger
9 years ago
2aa4773cc1
Make the speculator serve up errors as plain text
...
... so that they are legible.
9 years ago
ec31c0f518
speculator: allow styling like matrix.org
9 years ago
cc4869e68a
Merge pull request #174 from matrix-org/daniel/speculatorhardening
...
Several improvements to speculator to prepare it for actually being used by the masses, not just us devs
9 years ago
c432396079
Add comment
9 years ago
866fa58276
Rename
9 years ago
e045f28b44
Pull out constant for permissions
...
Also, drop permissions from 0755 to 0700
9 years ago
24356d864e
Merge pull request #176 from matrix-org/daniel/gendoc
...
Tweaks to spec generation for matrix.org
9 years ago
4ac85997f5
Fix check
9 years ago
da93317a78
Take dir not files as args
9 years ago
ca3a9e3562
exec gendoc outside of script
9 years ago
e041033048
Rename file
9 years ago
8586744771
Add anchors to spec
...
This is currently done by a script on the prod serving machine.
We might as well keep the matrix.org spec and dev spec as similar as
possible.
9 years ago
6f1d00097b
Only bother trying to fetch if we need to
9 years ago
8872e17f93
Fall back to last known HEAD sha if fetch fails
9 years ago
dd53847211
Include command stderr in error text
9 years ago
9ad64b02d1
speculator: guard against concurrent git commands
9 years ago
0f0359d9c1
speculator: Nessle up some more if statements
9 years ago
740cc66a7c
speculator: Fetch before deciding head is fresh
9 years ago
27ffe7bacd
Don't serve rst diffs as HTML
9 years ago
c3608b3a69
Merge branch 'master' into daniel/continuservconcurrency
...
Conflicts:
scripts/continuserv/main.go
9 years ago
bbf9e229a7
continuserv: guard concurrent accesses to wg
9 years ago
1be5b856bd
Preserve text/plain for errors
...
Newlines are nice
9 years ago
7f6eafdce5
continuserv: set Content-Type header
9 years ago
937ff046d8
Force / to be HTML too
9 years ago
559747e77a
speculator: Sent Content-Type: text/html header
...
Go is auto-detecting that this is XML (because for some reason we
generate XHTML), and serving it with a Content-Type header text/xml.
This causes the browser to render it as XHTML, which gives interesting
quirks like extra newlines.
This forces the browser to interpret it as HTML.
What we should probably do instead of stop generating XHTML and start
generating HTML. But in the mean time, this will fix the rendering
issues.
9 years ago
71874870c8
Enable syntax highlighting for example http requests
9 years ago
1aeddac319
Cache spec output
...
Does not cache inability to generate spec. Does not cache diffs or
anything fancy. Just the raw spec generation.
9 years ago
df443c10ac
Move css into a css subdirectory.
...
Add css to put a bar next to blockquotes.
9 years ago
82d4ea199f
Trust Leo
9 years ago
e5559e4ea5
Merge pull request #106 from matrix-org/erikj/newline_gendoc_STOP_BEING_CRANKY
...
gendoc should just add newlines rather than complaining about the lack thereof
9 years ago
70704240dc
gendoc should just add newlines rather than complaining about the lack thereof
9 years ago
013b6db895
Add a note on building the speculator
...
... because the wiki says you need to read the README on how to build it.
9 years ago
270e1d7aa8
Add richvdh to list of trusted pushers for spectulator
...
richvdh is awesome, he should have all the permissions.
9 years ago
1cfe4f784f
special css for spec/howto
9 years ago
ceebf34fca
generate docs with new nav bar
9 years ago
6922850643
Add missing return
9 years ago
b46f0e30b8
Checkout SHA of origin/master rather than merging
9 years ago
a0cf485919
speculator: Specify merge target
9 years ago
7805ca87df
If build.py throws, actually print stdout. Also run jenkins.sh in verbose mode.
9 years ago
8c092e3d11
Merge pull request #74 from matrix-org/module-presence
...
Presence module
9 years ago
7df3d9090a
Merge pull request #81 from matrix-org/daniel/speculatormerge
...
speculator: Merge after fetching, so that /spec/head works
9 years ago
0e8f1b5475
Quote args
9 years ago
a69e03f577
speculator: Report listening port
9 years ago
30232f20aa
speculator: Merge after fetching, so that /spec/head works
9 years ago
cc6f256b24
Merge branch 'master' into module-presence
...
Conflicts:
specification/modules/presence.rst
9 years ago
f74cb4d54c
Merge pull request #76 from matrix-org/speculator-speedup
...
Modify how speculator uses git repos
9 years ago
b6f0b67da6
Speed up continuserv
...
Ignore .git directory as that shouldn't affect spec generation. Also, when
we receive writes from the OS, wait a bit before re-generating the spec to
clump together multiple writes rather than re-generating one after another
and waiting for no more writes before serving the request.
9 years ago
ede43fbe9f
Modify how speculator uses git repos
...
Modified so it has a "master" repo and local A/B repos which pull from the
"master". This saves an extra git clone operation per HTTP request.
9 years ago
52f6496cf0
Merge branch 'master' into module-presence
9 years ago
a49d5f67f1
Delete rather than comment out the offending CSS
9 years ago
4e1e82f995
Fix paragraph CSS and adjust where paragraphs are in the RST
...
The CSS for `nature.css` was such that it was preventing `p` tags from
having sufficient vertical whitespace. This meant that you couldn't insert
any kind of spacing between lengthy sections (they just appeared as new lines).
This PR fixes this so you can actually have some whitespace between paragraphs.
As a result of this change, some parts of the spec appeared to have too much
whitespace. These were often sections which shouldn't have begun a new
paragraph anyway (e.g. a single sentence being an entire paragraph, `TODO`
blocks resulting in new paragraphs). This PR fixes the most offending areas
where we shouldn't have been inserting new paragraphs.
9 years ago
0a04672d76
Start converting the presence module. Add Rationale admonition.
9 years ago
083a76096f
Support viewing the spec at head
9 years ago
2434dfaf1c
Merge branch 'master' into speculator-htmldiff
9 years ago
6afdfc0771
Add more logging and make logging context clearer
...
This is now actually useful if you want to debug why your swagger YAML
isn't producing a table you think it should be.
9 years ago
f1adad5fb3
Add more logging with file prefixes
...
This makes the handoff between gendoc and batesian clearer in the logs.
9 years ago
064a2c9172
Use argparse and log functions for gendoc.py
...
gendoc.py has become more complex such that we actually want to pass things
to it like `--verbose`, `--nodelete`, `--target`, so use `argparse` to do this
like we have `build.py`. Pass through `-v` flags to `build.py`.
9 years ago
1da64db302
Use relative depths for groups instead of absolute ones
...
This means the group can be agnostic to how deeply nested it is,
improving reusability of groups.
9 years ago
16693a644a
Various review fixes
9 years ago
b21859836d
Print stdout of build.py in verbose mode
9 years ago
f71763b0d3
Implement relative title styles
...
Templates don't know at what level they will be inserted. Previously, we
hard-coded the title style which is not compatible with the build target
system. Define a set of styles which will be replaced by the gendoc script
when it encounters them:
'<' : Make this title a sub-heading
'/' : Make this title a heading at the same level
'>' : Make this title a super-heading
The build target system is now basically complete and functioning.
9 years ago
067363c629
Get the desired title levels right; print out the actual level used to stdout
9 years ago
d5e0115e42
Merge branch 'master' into spec-restructure-modules
9 years ago
65ce95249f
cat the spec according to the build target. Remove old checks as they are now obsolete since we don't care about the filename
9 years ago
8590cc84b5
Process and extract targets in gendoc.py
9 years ago
6b5b8432b3
Turn on code highlighting for HTTP api responses and add a
...
code highlighting stylesheet for the specification.
9 years ago
5fbd534713
Merge pull request #51 from matrix-org/daniel/gendoc
...
Print errors to stderr
9 years ago
cf8abdafd4
Fix PR comments
9 years ago
ba4998a62b
Apparently tabs are A Thing
9 years ago
427e4c8b1b
Log port being listened on
9 years ago
1f6b12b3e8
Modify and enforce the file format/structure used
...
Convert the file format to be of the form ##_##_something.rst where the
first ## is the top-level section number and the second ## is the
second-level section number, e.g. 07_01_push_cs_api.rst means
Section 7.1 - This is now enforced in gendoc.py along with the title line
style that should be used (= for top-level, - for 2nd level) which will
give helpful suggestions if you trip up. This feels much more intuitive
now looking in /specification
9 years ago
06e46c1899
Fix on a better numbering format
9 years ago
ef473b4161
Start enforcing title styles
...
This depends on the number of the file.
9 years ago
Travis Ralston