Skip to content

Commit

Permalink
Fixes #146. Fixes #145. Fixes #143. Fixes #142.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArneBachmann committed Jan 28, 2018
1 parent 4f9dee6 commit b2ef2ea
Show file tree
Hide file tree
Showing 5 changed files with 274 additions and 234 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Subversion Offline Solution (SOS 1.1.5) #
# Subversion Offline Solution (SOS 1.1.6) #

[![Travis badge](https://travis-ci.org/ArneBachmann/sos.svg?branch=master)](https://travis-ci.org/ArneBachmann/sos)
[![Build status](https://ci.appveyor.com/api/projects/status/fe915rtx02buqe4r?svg=true)](https://ci.appveyor.com/project/ArneBachmann/sos)
Expand Down Expand Up @@ -52,12 +52,14 @@ SOS supports three different file handling models that you may use to your likin
- Has a small user base as of now, therefore no reliable reports of compatibility and operational capability except for the automatic unit tests run on Travis CI and AppVeyor

### Compatibility ###
- SOS runs on any Python 3 distribution, including some versions of PyPy. Python 2 is not fully supported yet due to library issues, although SOS's programming language *Coconut* is generally able to transpile to valid Python 2 source code
- SOS runs on any Python 3 distribution, including some versions of PyPy. Python 2 is not fully supported yet due to library issues, although SOS's programming language *Coconut* is generally able to transpile to valid Python 2 source code. Use `pip install sos-vcs[backport]` for Python 2 installation
- SOS is compatible with above mentioned traditional VCSs: SVN, Git, gitless, Bazaar, Mercurial and Fossil
- Filename encoding and console encoding: Full roundtrip support (on Windows) started only with Python 3.6.4 and has not been tested nor confirmed yet for SOS


## Latest Changes ##
- Version 1.2 released on 2018-02-xx:
- ...
- Version 1.1 released on 2017-12-30:
- [Bug 90](https://github.com/ArneBachmann/sos/issues/90) Removed directories weren't picked up
- [Bug 93](https://github.com/ArneBachmann/sos/issues/93) Picky mode lists any file as added
Expand All @@ -69,7 +71,7 @@ SOS supports three different file handling models that you may use to your likin
- [QA 79](https://github.com/ArneBachmann/sos/issues/79) Added AppVeyor automated testing
- [QA 94](https://github.com/ArneBachmann/sos/issues/94) More test coverage
- Many little fixes and improvements
- Downloads until today: 1270
- Downloads until today: 3575
- Version 1.0 released on 2017-12-14:
- First release with basic functionality
- Lots of test cases, good test coverage
Expand Down
13 changes: 6 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import os, shutil, subprocess, sys, time, unittest
from setuptools import setup, find_packages

RELEASE = "1.1.5"
RELEASE = "1.1.6"

print("sys.argv is %r" % sys.argv)
readmeFile = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'README.md')
Expand All @@ -27,7 +27,7 @@
except: extra = "svn"
else: extra = "svn"
lt = time.localtime()
version = (lt.tm_year, (10 + lt.tm_mon) * 100 + lt.tm_mday, (10 + lt.tm_hour) * 100 + lt.tm_min)
version = (lt.tm_year, (10 + lt.tm_mon) * 100 + lt.tm_mday, (10 + lt.tm_hour) * 100 + lt.tm_min) # NO don't generate new version when using --dev option (to allow "pip install -e .") - was actually a mis-installation
versionString = '.'.join(map(str, version))
with open("sos%sversion.py" % os.sep, "w") as fd: # create version string at build time
fd.write("""\
Expand Down Expand Up @@ -72,7 +72,7 @@
setup(
name = 'sos-vcs',
version = sos.version.__version__.split("-")[0], # without extra
install_requires = ["appdirs >= 1.4.3", "chardet >= 3.0.4", "configr >= 2017.2129.2820", "termwidth >= 2017.2204.2811"], # all of them are optional dependencies, also coconut-develop>=1.3.1.post0.dev8
install_requires = ["appdirs >= 1.4.3", "chardet >= 3.0.4", "configr >= 2017.2129.2820", "termwidth >= 2017.2204.2811"], # all of them are optional dependencies
test_suite = "sos.tests",
description = "Subversion Offline Solution (SOS)",
long_description = README,
Expand Down Expand Up @@ -114,8 +114,7 @@
# 'mvcs=sos.sos:main' # meta version control system
]
},
# extras_require = {
# 'key1': ["library>=version", "option"],
# 'key2': ["library>=version"]
# }
extras_require = {
'backport': ["enum34"] # , "option"] # for Python 2 without backported enum
}
)
Loading

0 comments on commit b2ef2ea

Please sign in to comment.