Merge branch 'release-1.12.1'

.gitattributes

@@ -5,4 +5,5 @@
 debian-startscript text eol=lf
 systemd-spunkybot.service text eol=lf
 debian/* text eol=lf
+debian/source/format eol=lf
 setup.* text eol=lf

.github/workflows/ci.yml

@@ -52,7 +52,6 @@ jobs:
 
  - run: npm install -g markdown-link-check
  - run: markdown-link-check ./README.md
- - run: markdown-link-check ./CHANGELOG.md
  - run: markdown-link-check ./.github/CONTRIBUTING.md
  - run: markdown-link-check ./.github/SECURITY.md
  - run: markdown-link-check ./.github/CODE_OF_CONDUCT.md

.github/workflows/create-release.yml

@@ -24,6 +24,6 @@ jobs:
  release_name: v${{ github.ref }}
  body: |
  Changes in this Release
- - draft status
- draft: true
+ - to be done
+ draft: false
  prerelease: false

.github/workflows/pypi-publish.yml

@@ -9,6 +9,7 @@ on:
 
 jobs:
  deploy:
+ name: Publish
  runs-on: ubuntu-latest
  steps:
  - name: Checkout

.github/workflows/stale.yml

@@ -6,6 +6,7 @@ on:
 
 jobs:
  stale:
+ name: Check activity
 
  runs-on: ubuntu-latest
 
@@ -17,7 +18,7 @@ jobs:
  days-before-stale: 60
  days-before-close: 7
  stale-issue-label: 'wontfix'
- exempt-issue-labels: 'pinned,security,backlog'
+ exempt-issue-labels: 'backlog,confirmed,enhancement,security'
  #stale-pr-message: 'Stale pull request message'
  #stale-pr-label: 'no-pr-activity'
  #exempt-pr-labels: 'awaiting-approval,work-in-progress'

CHANGELOG.md

@@ -5,7 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/SpunkyBot/spunkybot/compare/1.12.0...develop)
+## [Unreleased](https://github.com/SpunkyBot/spunkybot/compare/1.12.1...develop)
+
+## [1.12.1](https://github.com/SpunkyBot/spunkybot/compare/1.11.0...1.12.0) - 2020-07-17
+
+### Fixed
+
+* Fixed #61: Ignore mapcycle.txt file in case of using dynamic mapcycle feature
+* Fixed #86: Problem with big and small cycle
 
 ## [1.12.0](https://github.com/SpunkyBot/spunkybot/compare/1.11.0...1.12.0) - 2020-07-11
 

VERSION

@@ -1 +1 @@
-1.12.0
+1.12.1

debian/changelog

@@ -1,3 +1,10 @@
+spunkybot (1.12.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Full changelog on https://github.com/spunkybot/spunkybot/releases
+
+ -- Spunky Bot Release Manager <releases@spunkybot.de> Fri, 17 Jul 2020 18:56:14 +0200
+
 spunkybot (1.12.0-1) unstable; urgency=medium
 
  * New upstream release.

setup.py

@@ -60,7 +60,7 @@
 .. _Urban Terror: http://www.urbanterror.info/
 .. _MIT: https://opensource.org/licenses/MIT
 .. _Homepage: https://spunkybot.de/
-.. _Repository: https://github.com/spunkybot/spunkybot/
+.. _Repository: https://github.com/SpunkyBot/spunkybot/
 """
 
 setup(name='spunkybot',
@@ -71,7 +71,7 @@
  author_email='feedback@spunkybot.de',
  url='https://spunkybot.de/',
  keywords='Urban Terror Game Administration RCON Bot',
- download_url='https://github.com/spunkybot/spunkybot/releases/latest',
+ download_url='https://github.com/SpunkyBot/spunkybot/releases/latest',
  license='MIT',
  install_requires=['setuptools'],
  py_modules=['spunky'],

spunky.py

@@ -22,7 +22,7 @@
 Run the bot: python spunky.py
 """
 
-__version__ = '1.12.0'
+__version__ = '1.12.1'
 
 
 ### IMPORTS
@@ -4077,6 +4077,7 @@ def set_current_map(self):
 
  if self.dynamic_mapcycle:
  self.send_rcon('g_nextmap %s' % self.next_mapname)
+ self.send_rcon('g_nextCycleMap %s' % self.next_mapname)
  if self.mapname != self.next_mapname:
  self.rcon_say("^7Next Map: ^3%s" % self.next_mapname)