Skip to content

Commit

Permalink
Adding ability to deploy through travisci. And docs.
Browse files Browse the repository at this point in the history
  • Loading branch information
illume committed Mar 7, 2018
1 parent 729a5ae commit bb19027
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 16 deletions.
50 changes: 35 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,53 @@

# sudo required currently for postgresql 9.6
dist: trusty
sudo: required
services:
- postgresql
- postgresql
before_install:
- sudo apt-get -qq update
- sudo apt-get install -y yui-compressor node optipng
- sudo apt-get -qq update
- sudo apt-get install -y yui-compressor node optipng
before_script:
- cp example.env .env
- psql -c 'create database pygame_test;' -U postgres
- psql pygame_test -c "CREATE USER pygame_test WITH PASSWORD 'password';" -U postgres
- psql pygame_test -c "GRANT ALL PRIVILEGES ON DATABASE pygame_test to pygame_test;" -U postgres
- cp example.env .env
- psql -c 'create database pygame_test;' -U postgres
- psql pygame_test -c "CREATE USER pygame_test WITH PASSWORD 'password';" -U postgres
- psql pygame_test -c "GRANT ALL PRIVILEGES ON DATABASE pygame_test to pygame_test;"
-U postgres
addons:
postgresql: "9.6"
postgresql: '9.6'
test:
adapter: postgresql
database: pygame_test

language: python
cache: pip
python:
- "3.6"
- '3.6'
install:
- pip install -r requirements.dev.txt
- pip install coveralls
- pip install -e .

script: APP_SECRET_KEY=a pytest

after_success:
- coveralls
- coveralls
deploy:
provider: pypi
user: illume
distributions: sdist bdist_wheel
before_deploy:
- pygameweb_release_version_correct
on:
branch:
- master
- mastertest
password:
secure: gzDc/dK0FJnLtcYBDXRu4PiIc+DvTBLKRbClBlSVayCiH0k+TzjatjwRJm9EPK0ctR3QX4esBrlxlLHVVIhjt1fWe/UcN+JEmR0ICPaPmcqR+17j+tPBX3PyrV8aULWe/PG9MgTKEZw9S8ysGPThlcXlcO0h65ma5/a58NZIBEKyamjXgrZmuipfYlMRjyk54c53gZGI+jKn3R3mgk+pDcjI3vL5pkA6QU69ucBhg/iLLoicpiTkUTfewV6nNcUKj88j162wgXshQ2Rnl7prvekDOaYeNplZzLto8gYO+HxO95povzG8nTxgqs1Soip1vW8hyPj4hmWkYfsxQt88UJZhnNaE+Dy2Uv+YyhxT7x9xonLB/HewOf2QROKElJG8qJ9CM+/F4QbkyRHXl9eP0hDbMDzc4cxAiuDJ0y3XysZBkRcBQoj+moDlyCv4LTc/bXhvoUXjCsmAI3xRmrV0j4Ml8wgoqFxT/bLH3CLW2sRmYg6mE+OCGfjubyxQPrwHLDOOJykj2kB1GCDhl1Jn0iGyRXdKzykSJPO3LJVelMmiwZwbdED0Nih70buG6EsEOquZhZB+oGltjO2W9rbphaxnoUDTQVq+JFrXD1eACY/42HJ4RZ9gBo0SqRCuGGaaYgw2BCvqinRoH+5qfoXontlkGX/XFbKQP3+3agJ0K+M=
skip_cleanup: true
deploy:
provider: pypi
user: illume
distributions: sdist bdist_wheel
before_deploy:
- pygameweb_release_version_correct
on:
tags: true
password:
secure: gzDc/dK0FJnLtcYBDXRu4PiIc+DvTBLKRbClBlSVayCiH0k+TzjatjwRJm9EPK0ctR3QX4esBrlxlLHVVIhjt1fWe/UcN+JEmR0ICPaPmcqR+17j+tPBX3PyrV8aULWe/PG9MgTKEZw9S8ysGPThlcXlcO0h65ma5/a58NZIBEKyamjXgrZmuipfYlMRjyk54c53gZGI+jKn3R3mgk+pDcjI3vL5pkA6QU69ucBhg/iLLoicpiTkUTfewV6nNcUKj88j162wgXshQ2Rnl7prvekDOaYeNplZzLto8gYO+HxO95povzG8nTxgqs1Soip1vW8hyPj4hmWkYfsxQt88UJZhnNaE+Dy2Uv+YyhxT7x9xonLB/HewOf2QROKElJG8qJ9CM+/F4QbkyRHXl9eP0hDbMDzc4cxAiuDJ0y3XysZBkRcBQoj+moDlyCv4LTc/bXhvoUXjCsmAI3xRmrV0j4Ml8wgoqFxT/bLH3CLW2sRmYg6mE+OCGfjubyxQPrwHLDOOJykj2kB1GCDhl1Jn0iGyRXdKzykSJPO3LJVelMmiwZwbdED0Nih70buG6EsEOquZhZB+oGltjO2W9rbphaxnoUDTQVq+JFrXD1eACY/42HJ4RZ9gBo0SqRCuGGaaYgw2BCvqinRoH+5qfoXontlkGX/XFbKQP3+3agJ0K+M=
skip_cleanup: true
31 changes: 31 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -226,3 +226,34 @@ With with a @cache decorator, and/or markup in a template.
.. |coverage-status| image:: https://coveralls.io/repos/github/pygame/pygameweb/badge.svg?branch=master
:target: https://coveralls.io/github/pygame/pygameweb?branch=master
:alt: Test coverage percentage




Releases
========

Releases are done from travisci. Fairly closely following this:
https://docs.travis-ci.com/user/deployment/pypi/

- Commits to `master` branch do a dev deploy to pypi.
- Commits to `mastertest` branch do a dev deploy to pypi.
- Commits to a tag do a real deploy to pypi.


https://packaging.python.org/tutorials/distributing-packages/#pre-release-versioning

Pre releases should be named like this:
```
# pygameweb/__init__.py
__version__ = '0.0.2'
```
Which is one version ahead of of the last tagged release.

Release tags should be like '0.0.2', and match the `pygameweb/__init__.py __version__`.

When everything is ready, tags should be done through github.

Note: do not tag pre releases (these are made on commits to `master`/`mastertest`).
https://help.github.com/articles/creating-releases/

2 changes: 1 addition & 1 deletion pygameweb/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '0.0.1'
__version__ = '0.0.2'


# So we can use environment variables to configure things.
Expand Down
2 changes: 2 additions & 0 deletions requirements.dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ pytest-pylint
pytest-timeout
pytest-watch
pytest-xdist
twine
wheel
-r requirements.txt
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@

addopts=-v --cov pygameweb pygameweb/ tests/

[bdist_wheel]
universal=1
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ def get_requirements():
'pygameweb.comment.classifier_train:classify_comments',
'pygameweb_worker='
'pygameweb.tasks.worker:work',
'pygameweb_release_version_correct='
'pygameweb.builds.update_version_from_git:release_version_correct',
],
},
)

0 comments on commit bb19027

Please sign in to comment.