pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maintenance' into devel

Browse source 
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
This commit is contained in:
Gina Häußge 2015-09-02 20:19:29 +02:00
commit 540cf4f4d9
3 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.versioneer-lookup
View file

@ -10,10 +10,10 @@
# master shall not use the lookup table, only tags
master
# maintenance is currently the branch for preparation of maintenance release 1.2.6
# maintenance is currently the branch for preparation of maintenance release 1.2.7
# so are any fix/... branches
maintenance 1.2.6 96fc70bdb2dd74ba04c3071f70da385b0408904a
fix/.* 1.2.6 96fc70bdb2dd74ba04c3071f70da385b0408904a
maintenance 1.2.7 536bb31965db17b969e7c1c53e241ddac4ae1814
fix/.* 1.2.7 536bb31965db17b969e7c1c53e241ddac4ae1814
# Special case disconnected checkouts, e.g. 'git checkout <tag>'
\(detached.*

18
CHANGELOG.md
View file

@ -45,6 +45,24 @@
GCODE) for printing on the file API.
* Changes to a user's personal settings via the UI now propagate across sessions.
## 1.2.6 (2015-09-02)
### Improvements
* Added support for version reporting on detached checkouts
(see [#1041](https://github.com/foosel/OctoPrint/pull/1041))
### Bug Fixes
* Pinned requirement for [psutil](https://pypi.python.org/pypi/psutil)
dependency to version 3.1.1 of that library due to an issue when
installing version 3.2.0 of that library released on 2015-09-02 through
a `python setup.py install` on OctoPrint. Also pinned all other requirements
to definitive versions that definitely work while at it to keep that from
happening again.
([Commits](https://github.com/foosel/OctoPrint/compare/1.2.5...1.2.6))
## 1.2.5 (2015-08-31)
### Improvements

24
setup.py
View file

@ -16,23 +16,23 @@ INSTALL_REQUIRES = [
"flask>=0.9,<0.11",
"werkzeug==0.8.3",
"tornado==4.0.1",
"sockjs-tornado>=1.0.0",
"sockjs-tornado==1.0.1",
"PyYAML==3.10",
"Flask-Login==0.2.2",
"Flask-Principal==0.3.5",
"Flask-Babel==0.9",
"Flask-Assets==0.10",
"pyserial",
"netaddr",
"watchdog",
"sarge>=0.1.4",
"netifaces",
"pylru",
"rsa",
"pkginfo",
"requests",
"semantic_version",
"psutil"
"pyserial==2.7",
"netaddr==0.7.17",
"watchdog==0.8.3",
"sarge==0.1.4",
"netifaces==0.8",
"pylru==1.0.9",
"rsa==3.2",
"pkginfo==1.2.1",
"requests==2.7.0",
"semantic_version==2.4.2",
"psutil==3.1.1"
]
# Additional requirements for optional install options