Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Commit

Permalink
Merge pull request #52 from steff456/fix_51
Browse files Browse the repository at this point in the history
PR: Update old things and remove unnecessary stuff
  • Loading branch information
ccordoba12 authored Jul 19, 2019
2 parents beb8f48 + 9ea4288 commit 694d12b
Show file tree
Hide file tree
Showing 26 changed files with 15 additions and 504 deletions.
31 changes: 0 additions & 31 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,6 @@
## Build status
[![CircleCI](https://circleci.com/gh/spyder-ide/spyder-plugin-cookiecutter.svg?style=svg)](https://circleci.com/gh/spyder-ide/spyder-plugin-cookiecutter)

----

## Important Announcement: Spyder is unfunded!

Since mid November/2017, [Anaconda, Inc](https://www.anaconda.com/) has
stopped funding Spyder development, after doing it for the past 18
months. Because of that, development will focus from now on maintaining
Spyder 3 at a much slower pace than before.

If you want to contribute to maintain Spyder, please consider donating at

https://opencollective.com/spyder

We appreciate all the help you can provide us and can't thank you enough for
supporting the work of Spyder devs and Spyder development.

If you want to know more about this, please read this
[page](https://github.com/spyder-ide/spyder/wiki/Anaconda-stopped-funding-Spyder).

----

## Overview

Expand Down Expand Up @@ -63,10 +43,6 @@ Powered by [Cookiecutter](https://github.com/audreyr/cookiecutter) :cookie:, Spy
- Integration with [ciocheck](https://github.com/ContinuumIO/ciocheck/) for linting and codestyle checking
- Integration with [Scrutinizer CI](https://scrutinizer-ci.com/) for Code Quality

### Repo Managing

- (Optional) Version managing with [versioneer](https://github.com/warner/python-versioneer)


## Usage

Expand All @@ -76,12 +52,6 @@ First, get Cookiecutter:
$ conda install "cookiecutter>=1.4.0"
```

If you want to use versioneer: (also you need to install git)

```
$ conda install versioneer
```

Now run against the repo:

```
Expand All @@ -107,7 +77,6 @@ create_config_page [n]:
use_ciocheck [y]:
support_python_2 [n]:
spyder3_compatibility [y]:
use_versioneer [y]:
```

## Testing
Expand Down
3 changes: 1 addition & 2 deletions cookiecutter.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@
"create_config_page": "n",
"use_ciocheck": "y",
"support_python_2": "n",
"spyder3_compatibility": "y",
"use_versioneer": "n"
"spyder3_compatibility": "y"
}
31 changes: 2 additions & 29 deletions hooks/post_gen_project.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""
Does the following:
1. Removes _version file and run versioneer install if use_versioneer == y
"""

from __future__ import print_function
Expand All @@ -17,23 +16,6 @@ def remove_file(file_name):
os.remove(file_name)


def remove_version_file():
"""Removes the _version file if versioneer is going to be used."""
file_name = os.path.join(PROJECT_DIRECTORY,
'{{ cookiecutter.project_name }}',
'_version.py')
remove_file(file_name)


def install_versioneer():
"""Start versioneer in the repository, this will create
versioneer.py and _version.py."""
try:
call(['versioneer', 'install'])
except Exception:
print(
"versioneer isn't avalaible, please install versioneer and run:\n $ versioneer install")

def init_git():
"""Start git repository"""
try:
Expand All @@ -42,16 +24,7 @@ def init_git():
print("git isn't avalaible, please install git and run:\n $ git init")


# 1. Removes _version file and run versioneer install if use_versioneer == y

if '{{ cookiecutter.use_versioneer }}'.lower() == 'y':
remove_version_file()

init_git()
install_versioneer()


# 2. Moves gitattributes to .gitattributes
# 1. Moves gitattributes to .gitattributes
# Having a .gitattributes with wrong syntax (because it has some jinja syntax)
# cause some annoying warnings

Expand All @@ -61,7 +34,7 @@ def init_git():
os.rename(old_gitattributes, new_gitattributes)


# 3. Create empty assets directory
# 2. Create empty assets directory

assets_dir = os.path.join(PROJECT_DIRECTORY,
'{{ cookiecutter.project_name }}',
Expand Down
7 changes: 2 additions & 5 deletions tests/test_cookiecutter_generation.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,8 @@ def test_default_configuration(cookies, context):

# Test creation of project files

toplevel_files = ['.github', 'conda.recipe', 'CHANGELOG.md',
'CONTRIBUTORS.md', 'LICENSE.txt', 'MANIFEST.in',
'README.rst', 'RELEASE.md', 'setup.py',
'requirements.txt', '.gitattributes',
'.scrutinizer.yml']
toplevel_files = ['MANIFEST.in', 'README.rst', 'setup.py',
'requirements.txt', '.gitattributes']

found_toplevel_files = [f.basename for f in result.project.listdir()]

Expand Down
110 changes: 0 additions & 110 deletions {{ cookiecutter.repo_name }}/.ciocheck

This file was deleted.

48 changes: 0 additions & 48 deletions {{ cookiecutter.repo_name }}/.circleci/config.yml

This file was deleted.

14 changes: 0 additions & 14 deletions {{ cookiecutter.repo_name }}/.coveragerc

This file was deleted.

15 changes: 0 additions & 15 deletions {{ cookiecutter.repo_name }}/.github/CONTRIBUTING.md

This file was deleted.

20 changes: 0 additions & 20 deletions {{ cookiecutter.repo_name }}/.github/ISSUE_TEMPLATE.md

This file was deleted.

11 changes: 0 additions & 11 deletions {{ cookiecutter.repo_name }}/.github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

13 changes: 0 additions & 13 deletions {{ cookiecutter.repo_name }}/.scrutinizer.yml

This file was deleted.

Empty file.
Empty file.
1 change: 0 additions & 1 deletion {{ cookiecutter.repo_name }}/CONTRIBUTORS.md

This file was deleted.

Loading

0 comments on commit 694d12b

Please sign in to comment.