Changed README and .gitignore, and VERSION

sportorg · Dec 12, 2017 · 695bcc7 · 695bcc7
1 parent d27571f
commit 695bcc7
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,11 +7,10 @@ log/
 
 data/*
 /languages/**/*.mo
-/python/
-/lib/
 /*.exe
+*.bat
+*.cmd
 SportOrg.spec
-SportOrg.bat
 
 resource.syso
 versioninfo.json
diff --git a/README.md b/README.md
@@ -8,16 +8,22 @@
 - [polib](http://polib.readthedocs.io/en/latest/quickstart.html)
 
 Install packages
-```
+```commandline
 pip install package-name
 
 pip install sireader
 ```
 
 or
 
+```commandline
+pip install -r requirements.txt
 ```
-pip install -t lib -r requirements.txt
+
+Run
+
+```commandline
+python SportOrg.pyw
 ```
 
 ### Struct
@@ -28,8 +34,7 @@ pip install -t lib -r requirements.txt
  docs/
  log/
  templates/
- python/
- lib/
+ test/
  img/
  icon/
  languages/
@@ -41,13 +46,15 @@ pip install -t lib -r requirements.txt
  gui/
  models/
  modules/
- lib/
+ libs/
  utils/
 ```
 
 ![Mainwindow sportorg](img/mainwindow.png)
 
 ![Dialogedit sportorg](img/dialogedit.png)
+![Result sportorg](img/result.png)
+![Bibprintout sportorg](img/bibprintout.png)
 
 ### build `go`
 

diff --git a/SportOrg.go b/SportOrg.go
@@ -12,10 +12,6 @@ func getGlobalPython() string {
  return "pythonw"
 }
 
-func getLocalPython() string {
- return "python/pythonw.exe"
-}
-
 func baseDir(p string) string {
  dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
  if err != nil {
@@ -35,12 +31,7 @@ func hasPython(p string) bool {
 func main() {
  argsWithoutProg := os.Args[1:]
 
- var pythonName string
- if hasPython(getLocalPython()) {
- pythonName = baseDir(getLocalPython())
- } else {
- pythonName = getGlobalPython()
- }
+ var pythonName = getGlobalPython()
 
  cmd := exec.Command(
  pythonName,

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,14 @@
+### 2017-12-12 v0.10.0-beta
++ Added the ability to edit splits
++ Support for multiple marking systems at the model level
++ Printing of bib
++ Numbering rows in tables
++ Ability to select templates for separation
++ New template for split
+- Taking into account the change in the starting time of the result
+* Changed the project structure
+
+
 ### 2017-11-15 v0.9.0-beta
 + Assigning of card for athlete while result editing
 + Result editing - interactive number change
@@ -29,5 +40,4 @@
 
 
 ### 2017-10-17 v0.7.2-beta
-
 * Init
diff --git a/img/bibprintout.png b/img/bibprintout.png
diff --git a/img/dialogedit.png b/img/dialogedit.png
diff --git a/img/mainwindow.png b/img/mainwindow.png
diff --git a/img/result.png b/img/result.png
diff --git a/sportorg/config.py b/sportorg/config.py
@@ -5,7 +5,7 @@
 from sportorg.core.version import Version
 
 NAME = 'SportOrg'
-VERSION = Version(0, 9, 0, 0, 'v', 'beta')
+VERSION = Version(0, 10, 0, 0, 'v', 'beta')
 DEBUG = True