Skip to content

Commit 419dd78

Browse files
authored
Merge pull request #203 from waldyrious/patch-1
Various improvements to the README
2 parents 11d93db + 83920b9 commit 419dd78

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

README.md

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# quickstatements3
22

3-
Repository for the development of a new version of QuickStatements
3+
Repository for the development of a version 3 of the [QuickStatements](https://www.wikidata.org/wiki/Help:QuickStatements) tool for making bulk edits to [Wikidata](https://www.wikidata.org).
44

55
## Local development HOW TO
66

@@ -16,7 +16,9 @@ To build the development container
1616
> make build
1717
```
1818

19-
Make sure that you have an env file inside the local etc/ dir. This file contains all the **ENVIRONMENT VARIABLES** used by the system and must never be added to your git repo.
19+
20+
Make sure that you have an env file inside the local etc/ dir.
21+
This file contains all the **ENVIRONMENT VARIABLES** used by the system and must never be added to your git repo.
2022

2123
To generate a good secret key you can run with python 3.6+
2224

@@ -30,6 +32,7 @@ To start all services (database, web server, run a shell inside the container)
3032
> make run
3133
```
3234

35+
3336
If everything is correct, **Quickstatements** will be available at http://localhost:8000/
3437

3538
If you are running this for the first time, you have to create a superuser for the Django admin. You can access the container with `make shell`. From there:
@@ -42,17 +45,19 @@ will run an interactive command which will ask you for your username, password,
4245

4346
## Wikibase server
4447

45-
QuickStatements 3.0 uses the Wikibase REST API to interact with a Wikibase server. To define which server it is pointing to, define the `BASE_REST_URL` environment variable, pointing to the `rest.php` endpoint, as in `BASE_REST_URL=https://test.wikidata.org/w/rest.php`.
48+
QuickStatements 3.0 uses the Wikibase REST API to interact with a Wikibase server.
49+
To define which server it is pointing to, define the `BASE_REST_URL` environment variable, pointing to the `rest.php` endpoint.
50+
For example: `BASE_REST_URL=https://test.wikidata.org/w/rest.php`.
4651

47-
It uses the Wikibase REST API provided in `/wikibase/v1` and the profile endpoint for the Oauth2 API, provided in `/oauth2` to check autoconfirmation status and authorize users.
52+
QuickStatements 3.0 uses the Wikibase REST API provided in `/wikibase/v1` and the profile endpoint for the Oauth2 API, provided in `/oauth2` to check autoconfirmation status and authorize users.
4853

4954
Currently it's only possible to point at one Wikibase instance.
5055

5156
## OAuth
5257

5358
This application uses OAuth2 with the Mediawiki provider.
5459

55-
The grants we probably need are
60+
The grants we probably need are:
5661

5762
* Perform high volume activity
5863
* High-volume (bot) access
@@ -69,25 +74,27 @@ After registering a consumer in
6974

7075
This application is listening on `/auth/callback/`, so, when registering, define the callback endpoint as `https://yourdomain.com/auth/callback/`.
7176

72-
After receveing the consumer id and secret, setup `OAUTH_CLIENT_ID` and `OAUTH_CLIENT_SECRET` environment variables.
77+
After receveing the consumer id and secret, set up the `OAUTH_CLIENT_ID` and `OAUTH_CLIENT_SECRET` environment variables.
7378

7479
### Developer access
7580

76-
If you want to login with a developer access token, you need to register for yourself an owner-only consumer application for OAuth2. Follow the form and be sure to tick "This consumer is for use only by <YOUR USERNAME>".
81+
If you want to login with a developer access token, you need to register for yourself an owner-only consumer application for OAuth2.
82+
Follow the form and be sure to tick "This consumer is for use only by <YOUR USERNAME>".
7783

7884
### Integration tests
7985

8086
To run Integration tests on https://test.wikidata.org, you'll need a developer access token (owner-only) to edit on `test.wikidata.org`.
8187

82-
After obtaining it, define the environment variable `INTEGRATION_TEST_AUTH_TOKEN` in `etc/env` file as your developer access token. Then, run the tests with `make integration`.
88+
After obtaining it, define the environment variable `INTEGRATION_TEST_AUTH_TOKEN` in `etc/env` file as your developer access token.
89+
Then, run the tests with `make integration`.
8390

8491
Alternatively, define that environment varibale inside the container shell and run the tests directly with `python3 manage.py test integration`.
8592

8693
## Toolforge deployment
8794

88-
* Login and enter into the tool user
95+
* Log in and enter into the tool user
8996
* Clone the repository at `~/www/python/`
90-
* Update `uwsgi.ini` with the toolname. In this case, its `qs-dev`
97+
* Update `uwsgi.ini` with the tool name (in this case, it's `qs-dev`)
9198
* Create the environment variables file at `~/www/python/src/.env` with `install -m 600 /dev/null ~/www/python/src/.env` so that only your user can read it.
9299
* Run `deploy.sh`
93100
* Logs are at `~/uwsgi.log`

0 commit comments

Comments
 (0)