Skip to content

Commit

Permalink
Fix publish building
Browse files Browse the repository at this point in the history
  • Loading branch information
onegreyonewhite committed Dec 19, 2019
1 parent feed3fd commit 4b5c16e
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 26 deletions.
29 changes: 16 additions & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@ stages:
- merge_requests
- web
- master
changes:
- polemarch/main/**/*
- polemarch/api/**/*
- polemarch/__init__.py
- tests.py
- setup.{py,cfg}
- MANIFEST.in
- requirements.txt
- requirements-test.txt
- Makefile
- tox.ini
- .coveragerc
- .gitlab-ci.yml
# changes:
# - polemarch/main/**/*
# - polemarch/api/**/*
# - polemarch/__init__.py
# - tests.py
# - setup.{py,cfg}
# - MANIFEST.in
# - requirements.txt
# - requirements-test.txt
# - Makefile
# - tox.ini
# - .coveragerc
# - .gitlab-ci.yml
retry: 2

# Branch tests
Expand Down Expand Up @@ -195,6 +195,9 @@ release_pypi:
publish_docker:
stage: publish
image: python:2-slim-jessie
services:
- name: 'docker:19.03-dind'
alias: 'docker_service_host'
script:
- pip install tox
- tox -e release-docker
Expand Down
34 changes: 22 additions & 12 deletions doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,12 @@ If you need to stop Polemarch use following command:
If you use another directory for storing Polemarch pid file, use path to this file.


Install from PyPI
-----------------
Install from docker
-------------------


## Run image
Run image
~~~~~~~~~

For run Polemarch docker image use command:

Expand All @@ -201,17 +202,20 @@ Using this command download official docker image and run it with default settin
Polemarch will be run with web interface on port `8080`


## Settings
Settings
~~~~~~~~

### Main section
Main section
~~~~~~~~~~~~

* **POLEMARCH_DEBUG** - status of debug mode. Default value: `false`.

* **POLEMARCH_LOG_LEVEL** - log level. Default value: `WARNING`.

* **TIMEZONE** - timezone. Default value: `UTC`.

### Database section
Database section
~~~~~~~~~~~~~~~~

If you not set **POLEMARCH_DB_HOST**, default database would be SQLite3, path to database file: `/db.sqlite3`. If you set **POLEMARCH_DB_HOST**, Polemarch would be use MYSQL with next variabls:

Expand All @@ -227,15 +231,18 @@ If you not set **POLEMARCH_DB_HOST**, default database would be SQLite3, path to

* **POLEMARCH_DB_PORT** - port for connection to database.

### Database.Options section
Database.Options section
~~~~~~~~~~~~~~~~~~~~~~~~

* **DB_INIT_CMD** - command to start your database

### Cache
Cache
~~~~~

* **CACHE_LOCATION** - path to cache, if you use `/tmp/polemarch_django_cache` path, then cache engine would be `FileBasedCache`, else `MemcacheCache`. Default value: ``/tmp/polemarch_django_cache`
### RPC section
RPC section
~~~~~~~~~~~
* **RPC_ENGINE** - connection to rpc service. If not set, not used.
Expand All @@ -244,15 +251,18 @@ If you not set **POLEMARCH_DB_HOST**, default database would be SQLite3, path to
* **RPC_CONCURRENCY** - Number of
concurrently tasks. Default value: `4`.
### Web section
Web section
~~~~~~~~~~~
* **POLEMARCH_WEB_REST_PAGE_LIMIT** - Limit elements in answer, when send REST request. Default value: `1000`.
### UWSGI section
UWSGI section
~~~~~~~~~~~~~
* **POLEMARCH_UWSGI_PROCESSES** - number of uwsgi processes. Default value: `4`.
### Other settings:
Other settings
~~~~~~~~~~~~~~
If you set `WORKER` to `ENABLE` state, uwsgi run worker as daemon.
Expand Down
2 changes: 1 addition & 1 deletion polemarch/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"VST_ROOT_URLCONF": os.getenv("VST_ROOT_URLCONF", 'vstutils.urls'),
}

__version__ = "1.6.1"
__version__ = "1.6.1.post1"

prepare_environment(**default_settings)

0 comments on commit 4b5c16e

Please sign in to comment.