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.

Sign up for GitHub

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

Jump to bottom

PR: Add Contributing file #4273

Merged
merged 12 commits into from
Apr 13, 2017
Merged

PR: Add Contributing file #4273

merged 12 commits into from
Apr 13, 2017

Conversation

rlaverde
Copy link
Member

@rlaverde rlaverde commented Mar 18, 2017 •
edited
Loading

Fixes #3986
Fixes #3573

The issue is label for 3.2 but I made it against 3.1.x because It doesn't change anything (only add documentation), and could me merged early.

When creating requirements file I noticed that flaky isn't available through conda so I make a little exception for this package

@rlaverde rlaverde self-assigned this Mar 18, 2017
@rlaverde rlaverde requested review from ccordoba12 and goanpeca March 18, 2017 00:53
@goanpeca
Copy link
Member

When creating requirements file I noticed that flaky isn't available through conda so I make a little exception for this package

What do you mean @rlaverde?

@rlaverde
Copy link
Member Author

rlaverde commented Mar 21, 2017 •
edited
Loading

What do you mean @rlaverde?

I added this to the test dependencies section (in the contributing), and exclude flaky from test_requirements.txt 

  $ conda install --file requirements/requirements.txt && pip install flaky
  $ pip install -r requirements/requirements.txt && pip install flaky

@goanpeca
Copy link
Member

goanpeca commented Mar 21, 2017 •
edited
Loading

Then please hold this PR until we have the flaky package on the spyder-ide channel. I will make it.

Tracking #4282

Why is circleci failing?

@ccordoba12
Copy link
Member

@rlaverde, please rebase this one in top of 3.x. This was supposedly simple, but now it requires more work.

@ccordoba12 ccordoba12 added this to the v3.2 milestone Mar 21, 2017
@goanpeca
Copy link
Member

@rlaverde could you update the code to include flaky? the conda-forge package recipe is merged now and the package should land in spyder-ide soon.

@rlaverde rlaverde changed the base branch from 3.1.x to 3.x March 23, 2017 21:51
@rlaverde
Copy link
Member Author

could you update the code to include flaky? the conda-forge package recipe is merged now and the package should land in spyder-ide soon.

@goanpeca Done, I also add spyder-ide channel to the instructions

@ccordoba12 I rebased it onto 3.x

rlaverde
rlaverde commented Mar 23, 2017
View reviewed changes
README.md Outdated
@@ -169,6 +169,9 @@ a Python version greater than 2.7 (Python 3.2 is not supported anymore).
* **SciPy**: Import Matlab workspace files in the Variable Explorer.
* **Cython**: Run Cython files in the IPython console.

## Contributing

Everyone is invited to contribute. [Read the contributing instructions](CONTRIBUTING.md), then get started.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I change this for the complete link?
https://github.com/spyder-ide/spyder/blob/master/CONTRIBUTING.md

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, please.

rlaverde
rlaverde commented Mar 23, 2017
View reviewed changes
CONTRIBUTING.md Outdated
### Creating a conda environment (or virtualenv)

```bash
$ conda create -n spyder spyder
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I leave this instruction? or only advice to install dependencies from requirements file?

@goanpeca
Copy link
Member

goanpeca commented Mar 24, 2017 •
edited
Loading

@rlaverde flaky is now on https://anaconda.org/spyder-ide/flaky

ccordoba12
ccordoba12 approved these changes Apr 13, 2017
View reviewed changes
Copy link
Member

@ccordoba12 ccordoba12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I improved wording a bit, but I think this is ready now!

@ccordoba12 ccordoba12 changed the title PR: Add contributing file. PR: Add Contributing file Apr 13, 2017
@ccordoba12 ccordoba12 merged commit 3ca1791 into spyder-ide:3.x Apr 13, 2017
ccordoba12 added a commit that referenced this pull request Apr 13, 2017
@ccordoba12
Merge from 3.x: PR #4273
98a2d04 
Fixes #3986
Fixes #3573

[ci skip]
@rlaverde rlaverde deleted the add-contributing branch June 5, 2017 20:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ccordoba12 ccordoba12 ccordoba12 approved these changes

@goanpeca goanpeca Awaiting requested review from goanpeca

Assignees

@rlaverde rlaverde

Labels
None yet
Projects
None yet
Milestone
v3.2
Development

Successfully merging this pull request may close these issues.
3 participants
@rlaverde @goanpeca @ccordoba12