-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #17 from tranlyvu/dev
Merge from dev branch
- Loading branch information
Showing
9 changed files
with
207 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |
| __pycache__/ | ||
| *.py[cod] | ||
| *$py.class | ||
| **.pyc | ||
|
|
||
| # Distribution / packaging | ||
| .Python | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,25 @@ | ||
| language: python | ||
| python: | ||
| - "3.6" | ||
| # command to install dependencies | ||
| install: | ||
| - pip install -r requirements.txt | ||
| - pip install python-coveralls | ||
| services: | ||
| - mysql | ||
| # command to run tests | ||
| script: | ||
| - pytest --cov=wikilink tests/ --cov-report=html | ||
| - echo "skipping tests" | ||
| #- pytest --cov=wikilink tests/integration --cov-report=html | ||
| branches: | ||
| only: | ||
| - dev | ||
| after_success: | ||
| - coveralls | ||
| matrix: | ||
| include: | ||
| - python: 3.6 | ||
| - python: 3.7 | ||
| dist: xenial | ||
| sudo: true | ||
|
|
||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| # Contributor Covenant Code of Conduct | ||
|
|
||
| ## Our Pledge | ||
|
|
||
| In the interest of fostering an open and welcoming environment, we as | ||
| contributors and maintainers pledge to making participation in our project and | ||
| our community a harassment-free experience for everyone, regardless of age, body | ||
| size, disability, ethnicity, sex characteristics, gender identity and expression, | ||
| level of experience, education, socio-economic status, nationality, personal | ||
| appearance, race, religion, or sexual identity and orientation. | ||
|
|
||
| ## Our Standards | ||
|
|
||
| Examples of behavior that contributes to creating a positive environment | ||
| include: | ||
|
|
||
| * Using welcoming and inclusive language | ||
| * Being respectful of differing viewpoints and experiences | ||
| * Gracefully accepting constructive criticism | ||
| * Focusing on what is best for the community | ||
| * Showing empathy towards other community members | ||
|
|
||
| Examples of unacceptable behavior by participants include: | ||
|
|
||
| * The use of sexualized language or imagery and unwelcome sexual attention or | ||
| advances | ||
| * Trolling, insulting/derogatory comments, and personal or political attacks | ||
| * Public or private harassment | ||
| * Publishing others' private information, such as a physical or electronic | ||
| address, without explicit permission | ||
| * Other conduct which could reasonably be considered inappropriate in a | ||
| professional setting | ||
|
|
||
| ## Our Responsibilities | ||
|
|
||
| Project maintainers are responsible for clarifying the standards of acceptable | ||
| behavior and are expected to take appropriate and fair corrective action in | ||
| response to any instances of unacceptable behavior. | ||
|
|
||
| Project maintainers have the right and responsibility to remove, edit, or | ||
| reject comments, commits, code, wiki edits, issues, and other contributions | ||
| that are not aligned to this Code of Conduct, or to ban temporarily or | ||
| permanently any contributor for other behaviors that they deem inappropriate, | ||
| threatening, offensive, or harmful. | ||
|
|
||
| ## Scope | ||
|
|
||
| This Code of Conduct applies both within project spaces and in public spaces | ||
| when an individual is representing the project or its community. Examples of | ||
| representing a project or community include using an official project e-mail | ||
| address, posting via an official social media account, or acting as an appointed | ||
| representative at an online or offline event. Representation of a project may be | ||
| further defined and clarified by project maintainers. | ||
|
|
||
| ## Enforcement | ||
|
|
||
| Instances of abusive, harassing, or otherwise unacceptable behavior may be | ||
| reported by contacting the project team at vutransingapore@gmail.com. All | ||
| complaints will be reviewed and investigated and will result in a response that | ||
| is deemed necessary and appropriate to the circumstances. The project team is | ||
| obligated to maintain confidentiality with regard to the reporter of an incident. | ||
| Further details of specific enforcement policies may be posted separately. | ||
|
|
||
| Project maintainers who do not follow or enforce the Code of Conduct in good | ||
| faith may face temporary or permanent repercussions as determined by other | ||
| members of the project's leadership. | ||
|
|
||
| ## Attribution | ||
|
|
||
| This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, | ||
| available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html | ||
|
|
||
| [homepage]: https://www.contributor-covenant.org | ||
|
|
||
| For answers to common questions about this code of conduct, see | ||
| https://www.contributor-covenant.org/faq |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| # **Instructions for contributors** | ||
|
|
||
| For bug reports or requests please submit an [issue](https://github.com/tranlyvu/wiki-link/issues). | ||
|
|
||
| For new feature contribution, please follow the following instruction: | ||
|
|
||
| 1. Fork the repo https://github.com/tranlyvu/wiki-link.git to your own github | ||
|
|
||
| 2. Clone from your own repo | ||
|
|
||
| `$ git clone https://github.com/<your name>/wiki-link.git` | ||
|
|
||
| 3. Make sure you are at dev branch | ||
|
|
||
| `$ git checkout dev && git pull` | ||
|
|
||
| 4. Create your feature/bug-fix branch | ||
|
|
||
| `$ git checkout -b <feature/bug>/<branch-name>` | ||
|
|
||
| Do remember to add your name into the [list of contributors](https://github.com/tranlyvu/wiki-link/blob/dev/CONTRIBUTORS.md) if you have not done so before going to step 5. | ||
|
|
||
| 5. Commit your changes | ||
|
|
||
| `$ git commit -am 'Add some new feature'` | ||
|
|
||
| 6. Push to the branch | ||
|
|
||
| `$ git push` | ||
|
|
||
| 7. Go to your own repo and create a new Pull Request against 'dev' branch | ||
|
|
||
| 8. To sync your forked repo with my repo | ||
|
|
||
| ``` | ||
| $ git remote add upstream https://github.com/tranlyvu/wiki-link.git | ||
| $ git checkout master | ||
| $ git merge upstream/master | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # **List of contributors** | ||
|
|
||
| Tran Ly Vu <vutransingapore@gmail.com> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.