Skip to content

Commit a2364ab

Browse files
authored
Merge pull request #52 from moremoban/dev
release 0.0.1
2 parents 6368096 + 55392da commit a2364ab

8 files changed

+84
-12
lines changed

.moban.dt/local-README.rst.jj2

+17-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
It is used with `yehua <https://github.com/chfw/yehua>`_.
99
Organisations using it:
1010

11-
- `pyexcel <https://github.com/pyexcel/pyexcel>`_.
12-
- `coala <https://github.com/coala/coala>`_.
11+
- `pyexcel mobans <https://github.com/pyexcel/pyexcel-mobans>`_.
12+
- `coala mobans <https://gitlab.com/coala/mobans>`_.
13+
- `pyecharts pypkg mobans <https://github.com/pyecharts/pypkg-mobans>`_.
14+
- `echarts maps mobans <https://github.com/echarts-maps/echarts-js-mobans>`_.
1315

1416
Features
1517
================================================================================
@@ -26,9 +28,21 @@ setup.py
2628
- automatically do git release while uploading to pypi
2729

2830
3. configured to build universial wheels by default
31+
32+
4. comes with a feature of removing comments from requirements.txt while loading
33+
into setup.py
34+
2935
{% endblock %}
3036

3137
{% block bottom_block %}
38+
Development process
39+
================================================================================
40+
41+
Please fork and make pull request to **dev** branch. Per each release, dev branch
42+
will be merged into master branch.
43+
44+
In order to make moban updates: please call `make`.
45+
3246
Notes
3347
================================================================================
3448

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

4862
And you need to configure `gease`.
4963
{% endblock %}
64+

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
include:
1616
- stage: moban
1717
script:
18-
- moban -m local.yml
18+
- make
1919
- git diff --exit-code
2020

2121
stage: test

CHANGELOG.rst

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Change log
2+
================================================================================
3+
4+
0.0.1 - 05.11.2018
5+
--------------------------------------------------------------------------------
6+
7+
First release
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. versioning is applied
11+
#. Pipfile included

Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
all: upstreaming
2+
3+
upstreaming:
4+
moban -m mobanfile

README.rst

+16-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ Scaffolding templates for your Python project.
1616
It is used with `yehua <https://github.com/chfw/yehua>`_.
1717
Organisations using it:
1818

19-
- `pyexcel <https://github.com/pyexcel/pyexcel>`_.
20-
- `coala <https://github.com/coala/coala>`_.
19+
- `pyexcel mobans <https://github.com/pyexcel/pyexcel-mobans>`_.
20+
- `coala mobans <https://gitlab.com/coala/mobans>`_.
21+
- `pyecharts pypkg mobans <https://github.com/pyecharts/pypkg-mobans>`_.
22+
- `echarts maps mobans <https://github.com/echarts-maps/echarts-js-mobans>`_.
2123

2224
Features
2325
================================================================================
@@ -35,6 +37,10 @@ setup.py
3537

3638
3. configured to build universial wheels by default
3739

40+
4. comes with a feature of removing comments from requirements.txt while loading
41+
into setup.py
42+
43+
3844
Installation
3945
================================================================================
4046

@@ -45,6 +51,14 @@ You can get it:
4551
$ git clone https://github.com/moremoban/pypi-mobans.git
4652
$ cd pypi-mobans
4753
54+
Development process
55+
================================================================================
56+
57+
Please fork and make pull request to **dev** branch. Per each release, dev branch
58+
will be merged into master branch.
59+
60+
In order to make moban updates: please call `make`.
61+
4862
Notes
4963
================================================================================
5064

changelog.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: "pypi-mobans"
2+
organisation: moremoban
3+
releases:
4+
- changes:
5+
- action: First release
6+
details:
7+
- versioning is applied
8+
- Pipfile included
9+
date: 05.11.2018
10+
version: 0.0.1
11+

local.yml mobanfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ requires:
33
configuration:
44
configuration: config/data.yml
55
template_dir:
6-
- .moban.dt/
6+
- .moban.dt
77
- templates
88
- sphinx:sphinx/templates/quickstart
99
targets:
1010
- .gitignore: gitignore.jj2
1111
- LICENSE: NEW_BSD_LICENSE.jj2
1212
- README.rst: local-README.rst.jj2
13+
- output: CHANGELOG.rst
14+
configuration: changelog.yml
15+
template: CHANGELOG.rst.jj2
1316
copy:
1417
- templates/docs/Makefile.jj2: Makefile.new_t
1518
- templates/docs/make.bat.jj2: make.bat.new_t

templates/setup.py.jj2

+20-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ from shutil import rmtree
1515
{% if external_module_library %}
1616
from distutils.core import setup, Extension
1717
{% else %}
18-
from setuptools import setup, find_packages, Command
18+
19+
from setuptools import Command, setup, find_packages
20+
1921
{%endif%}
2022
{%block platform_block%}
2123
from platform import python_implementation
@@ -70,13 +72,12 @@ FILES = ['README.rst',{%block morefiles %}{%endblock%} 'CHANGELOG.rst']
7072
{% endif %}
7173
{% endif %}
7274
KEYWORDS = [
75+
'python',
7376
{% for keyword in keywords %}
7477
'{{keyword}}',
7578
{% endfor %}
76-
{% if additional_keywords %}
77-
{{ additional_keywords -}}
78-
{% endif %}
79-
'python',
79+
{%block additional_keywords -%}
80+
{%endblock%}
8081
]
8182

8283
CLASSIFIERS = [
@@ -111,8 +112,21 @@ if python_implementation == "PyPy":
111112
{%- endmacro %}
112113
INSTALL_REQUIRES = [
113114
{% for dependency in dependencies: %}
114-
{% if ';' not in dependency: %}
115+
{% if ';' not in dependency and not dependency.startswith('#'): %}
116+
{% if '#egg=' in dependency: %}
117+
{% set dependency = dependency.split('#egg=') %}
118+
{% set repo_link, egg_name = dependency[0], dependency[1] %}
119+
{% set repo_link = repo_link.strip() %}
120+
{% if '#' in egg_name: %}
121+
{% set egg_name = egg_name.split('#')[0].strip() %}
122+
{% endif %}
123+
'{{[repo_link, egg_name] | join('#egg=')}}',
124+
{% elif '#' in dependency: %}
125+
{% set dependency = dependency.split('#')[0].strip() %}
126+
'{{dependency}}',
127+
{% else %}
115128
'{{dependency}}',
129+
{% endif %}
116130
{% endif %}
117131
{% endfor %}
118132
]

0 commit comments

Comments
 (0)