Skip to content

Commit

Permalink
Merge pull request #52 from moremoban/dev
Browse files Browse the repository at this point in the history
release 0.0.1
  • Loading branch information
chfw authored Nov 8, 2018
2 parents 6368096 + 55392da commit a2364ab
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 12 deletions.
19 changes: 17 additions & 2 deletions .moban.dt/local-README.rst.jj2
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
It is used with `yehua <https://github.com/chfw/yehua>`_.
Organisations using it:

- `pyexcel <https://github.com/pyexcel/pyexcel>`_.
- `coala <https://github.com/coala/coala>`_.
- `pyexcel mobans <https://github.com/pyexcel/pyexcel-mobans>`_.
- `coala mobans <https://gitlab.com/coala/mobans>`_.
- `pyecharts pypkg mobans <https://github.com/pyecharts/pypkg-mobans>`_.
- `echarts maps mobans <https://github.com/echarts-maps/echarts-js-mobans>`_.

Features
================================================================================
Expand All @@ -26,9 +28,21 @@ setup.py
- automatically do git release while uploading to pypi

3. configured to build universial wheels by default

4. comes with a feature of removing comments from requirements.txt while loading
into setup.py

{% endblock %}

{% block bottom_block %}
Development process
================================================================================

Please fork and make pull request to **dev** branch. Per each release, dev branch
will be merged into master branch.

In order to make moban updates: please call `make`.

Notes
================================================================================

Expand All @@ -47,3 +61,4 @@ your home folder as::

And you need to configure `gease`.
{% endblock %}

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
include:
- stage: moban
script:
- moban -m local.yml
- make
- git diff --exit-code

stage: test
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Change log
================================================================================

0.0.1 - 05.11.2018
--------------------------------------------------------------------------------

First release
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

#. versioning is applied
#. Pipfile included
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
all: upstreaming

upstreaming:
moban -m mobanfile
18 changes: 16 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ Scaffolding templates for your Python project.
It is used with `yehua <https://github.com/chfw/yehua>`_.
Organisations using it:

- `pyexcel <https://github.com/pyexcel/pyexcel>`_.
- `coala <https://github.com/coala/coala>`_.
- `pyexcel mobans <https://github.com/pyexcel/pyexcel-mobans>`_.
- `coala mobans <https://gitlab.com/coala/mobans>`_.
- `pyecharts pypkg mobans <https://github.com/pyecharts/pypkg-mobans>`_.
- `echarts maps mobans <https://github.com/echarts-maps/echarts-js-mobans>`_.

Features
================================================================================
Expand All @@ -35,6 +37,10 @@ setup.py

3. configured to build universial wheels by default

4. comes with a feature of removing comments from requirements.txt while loading
into setup.py


Installation
================================================================================

Expand All @@ -45,6 +51,14 @@ You can get it:
$ git clone https://github.com/moremoban/pypi-mobans.git
$ cd pypi-mobans
Development process
================================================================================

Please fork and make pull request to **dev** branch. Per each release, dev branch
will be merged into master branch.

In order to make moban updates: please call `make`.

Notes
================================================================================

Expand Down
11 changes: 11 additions & 0 deletions changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: "pypi-mobans"
organisation: moremoban
releases:
- changes:
- action: First release
details:
- versioning is applied
- Pipfile included
date: 05.11.2018
version: 0.0.1

5 changes: 4 additions & 1 deletion local.yml → mobanfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ requires:
configuration:
configuration: config/data.yml
template_dir:
- .moban.dt/
- .moban.dt
- templates
- sphinx:sphinx/templates/quickstart
targets:
- .gitignore: gitignore.jj2
- LICENSE: NEW_BSD_LICENSE.jj2
- README.rst: local-README.rst.jj2
- output: CHANGELOG.rst
configuration: changelog.yml
template: CHANGELOG.rst.jj2
copy:
- templates/docs/Makefile.jj2: Makefile.new_t
- templates/docs/make.bat.jj2: make.bat.new_t
Expand Down
26 changes: 20 additions & 6 deletions templates/setup.py.jj2
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ from shutil import rmtree
{% if external_module_library %}
from distutils.core import setup, Extension
{% else %}
from setuptools import setup, find_packages, Command

from setuptools import Command, setup, find_packages

{%endif%}
{%block platform_block%}
from platform import python_implementation
Expand Down Expand Up @@ -70,13 +72,12 @@ FILES = ['README.rst',{%block morefiles %}{%endblock%} 'CHANGELOG.rst']
{% endif %}
{% endif %}
KEYWORDS = [
'python',
{% for keyword in keywords %}
'{{keyword}}',
{% endfor %}
{% if additional_keywords %}
{{ additional_keywords -}}
{% endif %}
'python',
{%block additional_keywords -%}
{%endblock%}
]

CLASSIFIERS = [
Expand Down Expand Up @@ -111,8 +112,21 @@ if python_implementation == "PyPy":
{%- endmacro %}
INSTALL_REQUIRES = [
{% for dependency in dependencies: %}
{% if ';' not in dependency: %}
{% if ';' not in dependency and not dependency.startswith('#'): %}
{% if '#egg=' in dependency: %}
{% set dependency = dependency.split('#egg=') %}
{% set repo_link, egg_name = dependency[0], dependency[1] %}
{% set repo_link = repo_link.strip() %}
{% if '#' in egg_name: %}
{% set egg_name = egg_name.split('#')[0].strip() %}
{% endif %}
'{{[repo_link, egg_name] | join('#egg=')}}',
{% elif '#' in dependency: %}
{% set dependency = dependency.split('#')[0].strip() %}
'{{dependency}}',
{% else %}
'{{dependency}}',
{% endif %}
{% endif %}
{% endfor %}
]
Expand Down

0 comments on commit a2364ab

Please sign in to comment.