Merge pull request #273 from AllYarnsAreBeautiful/v0.95

V0.95

.gitignore

@@ -1,8 +1,9 @@
 ayab_log.txt
 # Python
 *.pyc
+*.pyo
 docs/_build/
-venv/
+venv*/
 ayab.egg-info
 dist
 # File is changed by CI
@@ -16,4 +17,10 @@ package_version
 # Obsolete Directories
 documents/
 patterns/
+# Buildfolder
 build/
+target/
+# macOS
+.DS_Store
+# VSCode
+.vscode

.gitlab-ci.yml

@@ -7,9 +7,7 @@ variables:
 
 stages:
   - build
-  - test
   - deploy
-  - test2
 
 cache:
   paths:
@@ -18,8 +16,8 @@ cache:
 
 before_script:
   - TAG=$(git describe --tags | sed 's/-/.post/' | cut -f1 -d'-')
-  - echo $TAG > package_version
-  - cat package_version
+  - echo $TAG > src/main/resources/base/ayab/package_version
+  - cat src/main/resources/base/ayab/package_version
 
 build:osx:
   tags:
@@ -31,14 +29,9 @@ build:osx:
     paths:
     - dist/release/
   script: 
-  - mac-build/install.sh
+  - mac-build/build.sh
   after_script:
-  - TAG=$(cat package_version)
-  - cd dist/release
-  - ls
-  - mv AYAB.dmg AYAB-${TAG}-osx.dmg
-  - ls
-  - cd ../..
+  - ls -lisa dist/release
 
 build:linux:
   image: python:3.5
@@ -51,32 +44,25 @@ build:linux:
     paths:
     - dist/release/
   script:
-  - cp linux-build/README.rst .
-  - linux-build/install.sh
+  - linux-build/build.sh
   after_script:
-  - TAG=$(cat package_version)
-  - cd dist/release
-  - ls
-  - mv ayab*.tar.gz AYAB-${TAG}-linux.tar.gz
-  - mv ayab*.whl AYAB-${TAG}-py3-none-any.whl
-  - ls
-  - cd ../..
+  - ls -lisa dist/release
 
-build:win7:
-  tags:
-    - win7
-    - virtualbox
-  stage: build
-  artifacts:
-    when: always
-    paths:
-    - dist/release/
-  script:
-  - windows-build/install.sh 7
-  after_script:
-  - cd dist/release
-  - ls
-  - cd ../..
+#build:win7:
+#  tags:
+#    - win7
+#    - virtualbox
+#  stage: build
+#  artifacts:
+#    when: always
+#    paths:
+#    - dist/release/
+#  script:
+#  - windows-build/build.sh 7
+#  after_script:
+#  - cd dist/release
+#  - ls
+# - cd ../..
 
 build:win10:
   tags:
@@ -88,120 +74,43 @@ build:win10:
     paths:
     - dist/release/
   script:
-  - windows-build/install.sh 10
+  - windows-build/build.sh 10
   after_script:
-  - cd dist/release
-  - ls
-  - cd ../..
-
-test:pypi_source:
-  tags:
-    - linux
-    - docker
-  stage: test
-  image: python:3.5
-  before_script:
-  - cd dist/release
-  - ls
-  script:
-  - pip3 install AYAB*.tar.gz
+  - ls -lisa dist/release
 
-test:pypi_wheel:
-  tags:
-    - linux
-    - docker
-  stage: test
-  image: python:3.5
-  before_script:
-  - cd dist/release
-  - ls
-  script:
-  - pip3 install AYAB*.whl
+#deploy:s3:
+#  tags:
+#    - linux
+#    - docker
+#  stage: deploy
+#  environment:
+#    name: s3
+#    url: http://ayab-debug.s3-website.eu-central-1.amazonaws.com
+#  image: python:latest
+#  before_script:
+#  - cp deploy/*.tpl dist/
+#  - cd dist/release
+#  - for i in `ls`; do echo "<li class=\"file\"><a href=\"$i\">$i</a></li>"; done > ../main.tpl
+#  - cd ../
+#  - cat header.tpl main.tpl footer.tpl > release/index.html
+#  - cd ../
+#  script:
+#  - pip install awscli
+# - aws s3 rm s3://$S3_BUCKET_NAME/ --recursive
+#  - aws s3 cp --acl public-read ./dist/release/ s3://$S3_BUCKET_NAME/ --recursive
 
-test:pypi_git:
-  tags:
-    - linux
-    - docker
-  stage: test
-  image: python:3.5
-  script:
-  - pip3 install -e git+https://gitlab.derchris.eu:10443/AllYarnsAreBeautiful/ayab-desktop.git@$CI_COMMIT_REF_NAME#egg=ayab
-
-deploy:s3:
-  tags:
-    - linux
-    - docker
-  stage: deploy
-  environment:
-    name: s3
-    url: http://ayab-debug.s3-website.eu-central-1.amazonaws.com
-  image: python:latest
-  before_script:
-  - cp deploy/*.tpl dist/
-  - cd dist/release
-  - for i in `ls`; do echo "<li class=\"file\"><a href=\"$i\">$i</a></li>"; done > ../main.tpl
-  - cd ../
-  - cat header.tpl main.tpl footer.tpl > release/index.html
-  - cd ../
-  script:
-  - pip install awscli
-  - aws s3 rm s3://$S3_BUCKET_NAME/ --recursive
-  - aws s3 cp --acl public-read ./dist/release/ s3://$S3_BUCKET_NAME/ --recursive
-
-deploy:github:
-  tags:
-    - linux
-    - docker
-  stage: deploy
-  environment:
-    name: github
-    url: https://github.com/AllYarnsAreBeautiful/ayab-desktop/releases
-  image: python:latest
-  script:
-  - cd dist/release
-  - ls
-  - /tools/upload.sh $CI_COMMIT_TAG master
-  only:
-  - tags
-
-deploy:pypi_test:
-    tags:
-    - linux
-    - docker
-    stage: deploy
-    environment:
-      name: pypi_test
-      url: https://testpypi.python.org/pypi/ayab
-    image: python:latest
-    script:
-    - pip install twine
-    - cd dist/release
-    - ls
-    - /tools/pypi.sh test
-
-deploy:pypi:
-    tags:
-    - linux
-    - docker
-    stage: deploy
-    environment:
-      name: pypi
-      url: https://pypi.python.org/pypi/ayab
-    image: python:latest
-    script:
-    - pip install twine
-    - cd dist/release
-    - ls
-    - /tools/pypi.sh prod
-    only:
-    - tags
-
-test2:pypi_test:
-  tags:
-    - linux
-    - docker
-  stage: test2
-  image: python:3.5
-  script:
-  - TAG=$(cat package_version)
-  - pip3 install --extra-index-url https://test.pypi.org/pypi ayab==${TAG}     
+#deploy:github:
+#  tags:
+#    - linux
+#    - docker
+#  stage: deploy
+#  environment:
+#    name: github
+#    url: https://github.com/AllYarnsAreBeautiful/ayab-desktop/releases
+#  image: python:latest
+#  script:
+#  - cd dist/release
+#  - ls
+#  - /tools/upload.sh $CI_COMMIT_TAG master
+#  only:
+#  - tags

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "patterns"]
-	path = patterns
+	path = src/main/resources/base/patterns
 	url = https://github.com/allyarnsarebeautiful/ayab-patterns

CHANGELOG.rst

@@ -1,6 +1,41 @@
 Release Notes
 -------------
 
+0.95 (December 2018)
+~~~~~~~~~~~~~~~~
+
+Firmware
+^^^^^^^^
+
+- Reduced carriage turn around time (#246)
+- Allowing some backwards carriage movement without advancing to the next row (#244)
+
+
+GUI
+^^^
+
+- Fixing macOS installation (at least macOS 10.12 (Sierra) is required to run AYAB) (#253)
+- Patterns with an odd number of stitches get centered on green 1 (#245)
+- Fixed lace patterns: 8-29, 8-30, 8-31, 9-32, 10-33, 10-34, 10-35, 10-36 (#249)
+- Writing date and time to the log (#259)
+- Fixing display on high-DPI screens (#166)
+
+
+0.91 (April 2018) (not released for public)
+~~~~~~~~~~~~~~~~
+
+Firmware
+^^^^^^^^
+
+-  Added experimental support for Garter Carriage
+-  Improvement of I2C communication (Pull request #11)
+-  Adjusting END_OF_LINE_OFFSET_L to 12 (Issue #9) 
+
+GUI
+^^^
+
+-  Adding Repeat action and shortcuts (Pull request #251)
+
 0.90 (August 2017)
 ~~~~~~~~~~~~~~~~