Skip to content

Commit 0a3cc83

Browse files
authored
Merge pull request #117 from akesterson/bugfix/travis_deployment
Fix akesterson's stored password in travis-ci, add instructions for cutting a new release
2 parents f463f86 + 57cd668 commit 0a3cc83

File tree

2 files changed

+47
-7
lines changed

2 files changed

+47
-7
lines changed

.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@ deploy:
22
provider: pypi
33
user: akesterson
44
password:
5-
secure: H0XRotyZm7xxpkR5bTxyjWSnwrUQUscKIj9Miqn9l1aROZN3GQ4oLLP8Epa590UQ/VLSlKQ28oalejlbDHG452K1726NAytO3r/0Oy/htuBf5DoR3VCa+aivOjeCVd2Axgc0385BB2ouG8aYJOL7Lc0sJ9fFUG7pQ2f3lZlzZLo=
6-
on:
5+
secure: RlZ3kw0x7/5QNBUIqj5wjkpS11TuSdH7o1S41m4Vea8HiryQjB2+CFf+uBXj8nb1OtYDRaeKTSnk3qVlUvaUglFd7sV+Hh2DDo4pYomd0xDFHnK2LB+hzbYftkOptmwdS2bc0X7vr+xdY+7b2DPTlyowrs3Xp2WvzRWM4hWnA3Q=
6+
true:
77
tags: true
88
branch: master
9-
109
sudo: false
1110
language: python
1211
python:
13-
- "3.6"
14-
- "3.8"
15-
- "pypy3"
12+
- '3.6'
13+
- '3.8'
14+
- pypy3
1615
install: travis_retry pip install tox-travis
1716
script: tox

MAINTAINERS.md

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,45 @@ The more complete process goes:
7474
4. Create a fork of dpath-python, and name your branch for the work. We name bugfixes as "bugfix/ISSUENUMBER_shortname"; features are named "feature/ISSUENUMBER_shortname".
7575
5. Complete and push your work on your fork. Use tox to test your work against the test suites. Features MUST ship with at least one new unit test that covers the new functionality. Bugfixes MUST ship with one new test (or an updated old test) that guards against regression.
7676
6. Send your pull request
77-
7. If accepted, the maintainers will merge your pull request and close the issue.
77+
7. If accepted, the maintainers will merge your pull request and close the issue.
78+
79+
80+
Cutting a New Release
81+
=====================
82+
83+
Releases for dpath occur automatically from travis-ci based on tags on the master branch.
84+
85+
akesterson@akesterson:~/dpath-python$ git tag
86+
1.0-0
87+
1.1
88+
1.2-66
89+
1.2-68
90+
1.2-70
91+
build,1.2,70
92+
build,1.2,71
93+
build,1.2,72
94+
build,1.3,0
95+
build,1.3,1
96+
build,1.3,2
97+
build,1.3,3
98+
build,1.4,0
99+
build,1.4,1
100+
build,1.4,3
101+
build,1.5,0
102+
build,2.0,0
103+
104+
Once upon a time, the version string was automatially computed based on the content of these tags. Now, however, the version string is stored statically in dpath/version.py
105+
106+
akesterson@akesterson:~/dpath-python$ cat dpath/version.py
107+
VERSION = "2.0.0"
108+
109+
To cut a new release, follow this procedure:
110+
111+
1. Commit a new dpath/version.py on the master branch with the format "MAJOR.MINOR.RELEASE"
112+
2. Add a new tag of the form "build,MAJOR.MINOR,RELEASE" to the master branch. This tag must have the same version number as the one commmited in dpath/version.py or we will fill your desk drawers with cockroaches.
113+
3. Push the new master version and the associated tag to github.
114+
4. travis-ci SHOULD push the new release to pypi.
115+
116+
If travis-ci fails to update pypi, follow the instructions on manually creating a release, here:
117+
118+
https://packaging.python.org/tutorials/packaging-projects/#uploading-the-distribution-archives

0 commit comments

Comments
 (0)