Skip to content

Commit f46f862

Browse files
committed
🤝 update with pypi-mobans
1 parent f04a6b2 commit f46f862

File tree

11 files changed

+88
-35
lines changed

11 files changed

+88
-35
lines changed

.github/workflows/pythonpublish.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Upload Python Package
2+
3+
on:
4+
release:
5+
types: [created]
6+
7+
jobs:
8+
deploy:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v1
12+
- uses: srt32/[email protected]
13+
with:
14+
args: git submodule update --init --recursive
15+
- name: Set up Python
16+
uses: actions/setup-python@v1
17+
with:
18+
python-version: '3.x'
19+
- name: Install dependencies
20+
run: |
21+
python -m pip install --upgrade pip
22+
pip install setuptools wheel twine
23+
- name: Build and publish
24+
env:
25+
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
26+
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
27+
run: |
28+
python setup.py sdist bdist_wheel
29+
twine upload dist/*

.travis.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
sudo: false
32
dist: xenial
43
language: python
@@ -14,36 +13,55 @@ python:
1413
- 2.7
1514

1615
stages:
17-
- test
1816
- lint
17+
- moban
18+
- test
1919

2020
.disable_global: &disable_global
21+
addons: false
22+
cache: false
23+
env: {}
24+
python: false
2125
before_install: false
22-
install: true
26+
install: false
2327
before_script: false
28+
script: false
2429
after_success: false
2530
after_failure: false
31+
before_deploy: false
32+
deploy: false
2633

2734
.lint: &lint
2835
<<: *disable_global
36+
git:
37+
submodules: false
2938
python: 3.6
3039
stage: lint
3140
install: pip install flake8
3241
script: flake8
3342

43+
.moban: &moban
44+
<<: *disable_global
45+
python: 3.6
46+
stage: moban
47+
install: pip install moban>=0.0.4
48+
script:
49+
- moban
50+
- git diff --exit-code
51+
3452
jobs:
3553
include:
54+
- *moban
3655
- *lint
3756

3857
stage: test
3958

40-
script: make test
41-
4259
before_install:
4360
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
4461
mv min_requirements.txt requirements.txt ;
4562
fi
46-
- test ! -f rnd_requirements.txt || pip install --no-deps -r rnd_requirements.txt
63+
- test ! -f rnd_requirements.txt ||
64+
pip install --no-deps -r rnd_requirements.txt
4765
- test ! -f rnd_requirements.txt || pip install -r rnd_requirements.txt ;
4866
- pip install -r tests/requirements.txt
4967
script:

CHANGELOG.rst

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,29 @@ Change log
44
0.0.4 - 04-05-2019
55
--------------------------------------------------------------------------------
66

7-
Updated
8-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7+
**Updated**
98

109
#. use pypi-mobans version 0.0.4 and 0.0.5
1110

1211
0.0.3.1 - 22-01-2019
1312
--------------------------------------------------------------------------------
1413

15-
Updated
16-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
14+
**Updated**
1715

1816
#. fix the bug where the pypi-mobans were completely missing
1917

2018
0.0.3 - 18-01-2019
2119
--------------------------------------------------------------------------------
2220

23-
Updated
24-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
21+
**Updated**
2522

2623
#. use pypi-mobans version 0.0.2 and 0.0.3
2724
#. added License file
2825

2926
0.0.2 - 08-11-2018
3027
--------------------------------------------------------------------------------
3128

32-
First release
33-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
29+
**First release**
3430

3531
#. use pypi as pacakge distribution source
3632
#. versioning is applied

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2018-2019 by Onni Software Ltd. and its contributors and its contributors
1+
Copyright (c) 2018-2020 by Onni Software Ltd. and its contributors and its contributors
22
All rights reserved.
33

44
Redistribution and use in source and binary forms of the software as well

README.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ pypi-mobans-pkg
88
.. image:: https://codecov.io/github/moremoban/pypi-mobans-pkg/coverage.png
99
:target: https://codecov.io/github/moremoban/pypi-mobans-pkg
1010

11+
.. image:: https://badge.fury.io/py/pypi-mobans-pkg.svg
12+
:target: https://pypi.org/project/pypi-mobans-pkg
13+
14+
.. image:: https://pepy.tech/badge/pypi-mobans-pkg/month
15+
:target: https://pepy.tech/project/pypi-mobans-pkg/month
16+
1117
.. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
1218
:target: https://gitter.im/chfw_moban/Lobby
1319

changelog.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: "pypi-mobans"
22
organisation: moremoban
33
releases:
4+
- changes:
5+
- action: Updated
6+
details:
7+
- use pypi-mobans version 0.0.9
8+
date: 12-1-2020
9+
version: 0.0.9
410
- changes:
511
- action: Updated
612
details:
@@ -10,7 +16,7 @@ releases:
1016
- changes:
1117
- action: Updated
1218
details:
13-
- fix the bug where the pypi-mobans were completely missing
19+
- fix the bug where the pypi-mobans were completely missing
1420
date: 22-01-2019
1521
version: 0.0.3.1
1622
- changes:

docs/source/conf.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
# This file only contains a selection of the most common options. For a full
99
# list see the documentation:
10-
# http://www.sphinx-doc.org/en/master/config
10+
# https://www.sphinx-doc.org/en/master/usage/configuration.html
1111

1212
# -- Path setup --------------------------------------------------------------
1313

@@ -22,12 +22,12 @@
2222
# -- Project information -----------------------------------------------------
2323

2424
project = 'pypi-mobans-pkg'
25-
copyright = '2018-2019 Onni Software Ltd. and its contributors'
25+
copyright = '2018-2020 Onni Software Ltd. and its contributors'
2626
author = 'C.W.'
2727
# The short X.Y version
28-
version = '0.0.4'
28+
version = '0.0.9'
2929
# The full version, including alpha/beta/rc tags
30-
release = '0.0.4'
30+
release = '0.0.9'
3131

3232
# -- General configuration ---------------------------------------------------
3333

@@ -39,9 +39,6 @@
3939
# Add any paths that contain templates here, relative to this directory.
4040
templates_path = ['_templates']
4141

42-
# The master toctree document.
43-
master_doc = ''
44-
4542
# The language for content autogenerated by Sphinx. Refer to documentation
4643
# for a list of supported languages.
4744
#
@@ -71,7 +68,7 @@
7168
# -- Options for intersphinx extension ---------------------------------------
7269

7370
# Example configuration for intersphinx: refer to the Python standard library.
74-
intersphinx_mapping = {'https://docs.python.org/': None}
71+
intersphinx_mapping = {'https://docs.python.org/3/': None}
7572
# TODO: html_theme not configurable upstream
7673
html_theme = 'default'
7774

@@ -85,3 +82,4 @@
8582
]
8683
intersphinx_mapping.update({
8784
})
85+
master_doc = "index"

pypi-mobans-pkg.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ organisation: "moremoban"
33
author: "C.W."
44
55
company: "Onni Software Ltd. and its contributors"
6-
version: "0.0.4"
7-
current_version: "0.0.4"
8-
release: "0.0.4"
9-
copyright_year: 2018-2019
6+
version: "0.0.9"
7+
current_version: "0.0.9"
8+
release: "0.0.9"
9+
copyright_year: 2018-2020
1010
license: public license
1111
dependencies:
1212
- lml

pypi_mobans_pkg/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = "0.0.4"
1+
__version__ = "0.0.9"
22
__author__ = "C.W."

setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929

3030
NAME = "pypi-mobans-pkg"
3131
AUTHOR = "C.W."
32-
VERSION = "0.0.4"
32+
VERSION = "0.0.9"
3333
3434
LICENSE = "public license"
3535
DESCRIPTION = (
3636
"Scaffolding mobans for your Python project."
3737
)
3838
URL = "https://github.com/moremoban/pypi-mobans-pkg"
39-
DOWNLOAD_URL = "%s/archive/0.0.4.tar.gz" % URL
39+
DOWNLOAD_URL = "%s/archive/0.0.9.tar.gz" % URL
4040
FILES = ["README.rst", "CHANGELOG.rst"]
4141
KEYWORDS = [
4242
"python",
@@ -70,8 +70,8 @@
7070
}
7171
# You do not need to read beyond this line
7272
PUBLISH_COMMAND = "{0} setup.py sdist bdist_wheel upload -r pypi".format(sys.executable)
73-
GS_COMMAND = ("gs pypi-mobans-pkg v0.0.4 " +
74-
"Find 0.0.4 in changelog for more details")
73+
GS_COMMAND = ("gs pypi-mobans-pkg v0.0.9 " +
74+
"Find 0.0.9 in changelog for more details")
7575
NO_GS_MESSAGE = ("Automatic github release is disabled. " +
7676
"Please install gease to enable it.")
7777
UPLOAD_FAILED_MSG = (
@@ -113,7 +113,7 @@ def run(self):
113113
self.status(NO_GS_MESSAGE)
114114
if run_status:
115115
if os.system(PUBLISH_COMMAND) != 0:
116-
self.status(UPLOAD_FAILED_MSG % PUBLISH_COMMAND)
116+
self.status(UPLOAD_FAILED_MSG)
117117

118118
sys.exit()
119119

0 commit comments

Comments
 (0)