Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Housekeeping #61

Merged
merged 8 commits into from
Jun 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 107 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,36 +1,124 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
lib
lib64
__pycache__
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.tox
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# celery beat schedule file
celerybeat-schedule

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Mr Developer
.mr.developer.cfg
.project
.pydevproject
# Pyre type checker
.pyre/
29 changes: 14 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
dist: xenial
language: python
python:
- "2.7"
- "3.4"
- "3.5"
before_install:
- source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
- wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
- sudo apt-get update -qq
- sudo apt-get install rethinkdb -y
- rethinkdb --version
- 2.7
- 3.4
- 3.5
- 3.6
- 3.7
addons:
- rethinkdb: 2.3
install:
- pip install .
before_script:
- rethinkdb --daemon
script: py.test tests/
- pip install .[dev]
script: pytest
deploy:
provider: pypi
user: $PYPI_USER
password: $PYPI_PASSWORD
user: linkyndy
password:
secure: "K7lrgkEOm9bDf7EEBQqGxDjnjAVBpQTOec9PmFgB/C8YWUJhhI8mhs/b6JCh32p9AQACbUn/2BBUVqWnTL0exBPQNsVzkpUeaj9OZJD8kFjx0uv5YwDzjEufh1dMJNUYzx2J3KGcDvn6aKSP0RXxLCFF97a6WYc9YN8tutlSLbQ="
on:
tags: true
skip_existing: true
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ You can contribute in many ways:

## Getting Started!

**Fork** this repo, `pip install -e .` the project, do your magic, `tox` and submit a pull request on the **develop** branch!
**Fork** this repo, `pip install -e .[dev]` the project, do your magic, `pytest` and submit a pull request on the **master** branch!

> Issues, features, bugs and questions are tracked at https://github.com/linkyndy/remodel/issues

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Andrei Horak
Copyright (c) 2019 Andrei Horak

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
5 changes: 5 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
'inflection',
'six'
],
extras_require={
'dev': [
'pytest'
]
},
classifiers=[
'Environment :: Web Environment',
'Intended Audience :: Developers',
Expand Down
7 changes: 0 additions & 7 deletions tox.ini

This file was deleted.