Skip to content

Commit

Permalink
Merge pull request #1 from soimort/develop
Browse files Browse the repository at this point in the history
1
  • Loading branch information
Justsoos authored Aug 11, 2019
2 parents 6e38f28 + aa151ac commit e0648a2
Show file tree
Hide file tree
Showing 59 changed files with 2,276 additions and 1,452 deletions.
39 changes: 0 additions & 39 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

48 changes: 0 additions & 48 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

16 changes: 12 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
# https://travis-ci.org/soimort/you-get
language: python
python:
- "3.2"
- "3.3"
- "3.4"
- "3.5"
- "3.6"
- "nightly"
- "pypy3"
matrix:
include:
- python: "3.7"
dist: xenial
- python: "3.8-dev"
dist: xenial
- python: "nightly"
dist: xenial
before_install:
- pip install flake8
before_script:
- flake8 . --count --select=E9,F63,F72,F82 --show-source --statistics
script: make test
sudo: false
notifications:
webhooks:
urls:
Expand Down
32 changes: 16 additions & 16 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
# How to Contribute
# How to Report an Issue

`you-get` is currently experimenting with an aggressive approach to handling issues. Namely, a bug report must be addressed with some code via a pull request.
If you would like to report a problem you find when using `you-get`, please open a [Pull Request](https://github.com/soimort/you-get/pulls), which should include:

## Report a broken extractor
1. A detailed description of the encountered problem;
2. At least one commit, addressing the problem through some unit test(s).
* Examples of good commits: [#2675](https://github.com/soimort/you-get/pull/2675/files), [#2680](https://github.com/soimort/you-get/pull/2680/files), [#2685](https://github.com/soimort/you-get/pull/2685/files)

**How-To:** Please open a new pull request with the following changes:
PRs that fail to meet the above criteria may be closed summarily with no further action.

* Add a new test case in [tests/test.py](https://github.com/soimort/you-get/blob/develop/tests/test.py), with the failing URL(s).
A valid PR will remain open until its addressed problem is fixed.

The Travis CI build will (ideally) fail showing a :x:, which means you have successfully reported a broken extractor.

Such a valid PR will be either *closed* if it's fixed by another PR, or *merged* if it's fixed by follow-up commits from the reporter himself/herself.

## Report other issues / Suggest a new feature
# 如何汇报问题

**How-To:** Please open a pull request with the proposed changes directly.
为了防止对 GitHub Issues 的滥用,本项目不接受一般的 Issue。

A valid PR need not be complete (i.e., can be WIP), but it should contain at least one sensible, nontrivial commit.
如您在使用 `you-get` 的过程中发现任何问题,请开启一个 [Pull Request](https://github.com/soimort/you-get/pulls)。该 PR 应当包含:

## Hints
1. 详细的问题描述;
2. 至少一个 commit,其内容是**与问题相关的**单元测试。**不要通过随意修改无关文件的方式来提交 PR!**
* 有效的 commit 示例:[#2675](https://github.com/soimort/you-get/pull/2675/files), [#2680](https://github.com/soimort/you-get/pull/2680/files), [#2685](https://github.com/soimort/you-get/pull/2685/files)

* The [`develop`](https://github.com/soimort/you-get/tree/develop) branch is where your pull request goes.
* Remember to rebase.
* Document your PR clearly, and if applicable, provide some sample links for reviewers to test with.
* Write well-formatted, easy-to-understand commit messages. If you don't know how, look at existing ones.
* We will not ask you to sign a CLA, but you must assure that your code can be legally redistributed (under the terms of the MIT license).
不符合以上条件的 PR 可能被直接关闭。

有效的 PR 将会被一直保留,直至相应的问题得以修复。
21 changes: 10 additions & 11 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
==============================================
This is a copy of the MIT license.
==============================================
Copyright (C) 2012-2017 Mort Yao <[email protected]>
Copyright (C) 2012 Boyu Guo <[email protected]>
MIT License

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
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
Copyright (c) 2012-2019 Mort Yao <[email protected]>
Copyright (c) 2012 Boyu Guo <[email protected]>

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 the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
Expand Down
Loading

0 comments on commit e0648a2

Please sign in to comment.