Skip to content

Commit fedfc2b

Browse files
authored
Merge pull request #142 from moremoban/dev
Update gitignore to date
2 parents 8e66f73 + f909756 commit fedfc2b

8 files changed

+83
-10
lines changed

.gitignore

+3-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ parts/
2525
sdist/
2626
var/
2727
wheels/
28-
pip-wheel-metadata/
2928
share/python-wheels/
3029
*.egg-info/
3130
.installed.cfg
@@ -143,10 +142,6 @@ dmypy.json
143142
# Cython debug symbols
144143
cython_debug/
145144

146-
# static files generated from Django application using `collectstatic`
147-
media
148-
static
149-
150145
# VirtualEnv rules
151146
# Virtualenv
152147
# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
@@ -431,6 +426,9 @@ tmtags
431426
!.vscode/extensions.json
432427
*.code-workspace
433428

429+
# Local History for Visual Studio Code
430+
.history/
431+
434432
# Xcode rules
435433
# Xcode
436434
#

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

+28-2
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ will be merged into master branch.
4343

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

46-
Notes
46+
User guides
4747
================================================================================
4848

49-
5049
Release and publish from command line
5150
--------------------------------------------------------------------------------
5251

@@ -76,5 +75,32 @@ two secrets::
7675

7776
Once you have done that, a github release will trigger an auto publishing.
7877

78+
79+
Restrict your package to a python version
80+
--------------------------------------------------------------------------------
81+
82+
The following strings are required in your project yaml file::
83+
84+
python_requires: ">=3.6"
85+
min_python_version: "3.6"
86+
87+
88+
Using dependency markers in `setup.py`
89+
--------------------------------------------------------------------------------
90+
91+
In order to use dependency markers in `setup.py`, add `setup_use_markers: true`
92+
in your `mobanfile.
93+
94+
95+
Developer Guides
96+
================================================================================
97+
98+
In order to update this README, please find the .moban.d/local-README.rst.jj2,
99+
and place your changes there.
100+
101+
Then call::
102+
103+
$ make upstreaming
104+
79105
{% endblock %}
80106

.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,15 @@ stages:
1717
git:
1818
submodules: false
1919
python: 3.6
20+
env:
21+
- MINREQ=0
2022
stage: lint
2123
script: make install_test lint
2224

2325
.moban: &moban
2426
python: 3.6
27+
env:
28+
- MINREQ=0
2529
stage: moban
2630
install: pip install moban>=0.0.4 gitfs2 pypifs
2731
script: make upstreaming git-diff-check

CHANGELOG.rst

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
Change log
22
================================================================================
33

4+
0.0.11 - 03.05.2020
5+
--------------------------------------------------------------------------------
6+
7+
**Updated**
8+
9+
#. Configure lint and moban stage use to MINREQ=0
10+
#. Updated gitignore to latest as of the release date
11+
412
0.0.10 - 20.04.2020
513
--------------------------------------------------------------------------------
614

README.rst

+28-2
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,9 @@ will be merged into master branch.
6060

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

63-
Notes
63+
User guides
6464
================================================================================
6565

66-
6766
Release and publish from command line
6867
--------------------------------------------------------------------------------
6968

@@ -92,3 +91,30 @@ two secrets::
9291
PYPI_PASSWORD
9392

9493
Once you have done that, a github release will trigger an auto publishing.
94+
95+
96+
Restrict your package to a python version
97+
--------------------------------------------------------------------------------
98+
99+
The following strings are required in your project yaml file::
100+
101+
python_requires: ">=3.6"
102+
min_python_version: "3.6"
103+
104+
105+
Using dependency markers in `setup.py`
106+
--------------------------------------------------------------------------------
107+
108+
In order to use dependency markers in `setup.py`, add `setup_use_markers: true`
109+
in your `mobanfile.
110+
111+
112+
Developer Guides
113+
================================================================================
114+
115+
In order to update this README, please find the .moban.d/local-README.rst.jj2,
116+
and place your changes there.
117+
118+
Then call::
119+
120+
$ make upstreaming

changelog.yml

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
name: pypi-mobans
22
organisation: moremoban
33
releases:
4+
- changes:
5+
- action: Updated
6+
details:
7+
- "Configure lint and moban stage use to MINREQ=0"
8+
- "Updated gitignore to latest as of the release date"
9+
date: 03.05.2020
10+
version: 0.0.11
411
- changes:
512
- action: Added
613
details:

templates/travis.yml.jj2

+4
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ stages:
4747
git:
4848
submodules: false
4949
python: 3.6
50+
env:
51+
- MINREQ=0
5052
stage: lint
5153
{% if lint_command == 'flake8' %}
5254
install: pip install flake8
@@ -57,6 +59,8 @@ stages:
5759
{% if moban_command != False %}
5860
.moban: &moban
5961
python: 3.6
62+
env:
63+
- MINREQ=0
6064
stage: moban
6165
install: pip install moban>=0.0.4 gitfs2 pypifs
6266
{% if moban_command.startswith('moban') and 'exit-code' not in moban_command %}

0 commit comments

Comments
 (0)