REL: release 2.1.0

certtools · Oct 15, 2019 · ced415d · ced415d
1 parent bde7636
commit ced415d
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,9 @@ CHANGELOG
 ==========
 
 
-2.1.0 (unreleased)
+2.1.0 (2019-10-15)
 -----------------
 
-### Configuration
-
 ### Core
 - `intelmq.lib.harmonization`:
   - Use correct parent classes.
@@ -39,8 +37,6 @@ CHANGELOG
   - add `file_name_from_response` to extract a file name from a Response object for downloaded files.
 - `intelmq.lib.upgrades`: Added `v210_deprecations` for deprecated parameters.
 
-### Development
-
 ### Harmonization
 - Add extra to reports.
 
@@ -91,8 +87,6 @@ CHANGELOG
 - `intelmq.tests.bots.outputs.amqptopic.test_output`: Added.
 - Move the documentation of most bots from separate README files to the central Bots.md and feeds.yaml files.
 
-### Packaging
-
 ### Tests
 - Travis:
   - Use UTC timezone.
@@ -115,6 +109,15 @@ CHANGELOG
 * EventDB: Scripts for applying malware name mapping and domain suffixes to an EventDB.
 
 ### Known issues
+- MongoDB authentication: compatibility on different MongoDB and pymongo versions (#1439)
+- ctl: shell colorizations are logged (#1436)
+- http stream collector: retry on regular connection problems? (#1435)
+- tests: capture logging with context manager (#1342)
+- Bots started with IntelMQ-Manager stop when the webserver is restarted. (#952)
+- n6 parser: mapping is modified within each run (#905)
+- reverse DNS: Only first record is used (#877)
+- Corrupt dump files when interrupted during writing (#870)
+
 
 2.0.2 (2019-10-14)
 -----------------

diff --git a/NEWS.md b/NEWS.md
@@ -3,14 +3,10 @@ NEWS
 
 See the changelog for a full list of changes.
 
-2.1.0 Feature release (unreleased)
+2.1.0 Feature release (2019-10-15)
 ----------------------------------
 
-### Requirements
-
-### Tools
-
-### Harmonization
+Run `intelmqctl upgrade-config` and `intelmqctl check` after the upgrade.
 
 ### Configuration
 #### Shadowserver Parser
@@ -26,10 +22,6 @@ The PostgreSQL Output Bot has been integrated into the new and generic SQL Outpu
   * new: `engine` = `postgresql`
 IntelMQ versions 2.x will be compatible with previous configurations. `intelmqctl upgrade-config` migrates configurations.
 
-### Libraries
-
-### Postgres databases
-
 
 2.0.2 Bugfix release (2019-10-14)
 ---------------------------------

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+intelmq (2.1.0-1) stable; urgency=medium
+
+  * Update to 2.1.0
+
+ -- Wagner Sebastian <[email protected]>  Tue, 15 Oct 2019 12:22:55 +0200
+
 intelmq (2.0.2-1) stable; urgency=medium
 
   * Update to 2.0.2.

diff --git a/docs/Release.md b/docs/Release.md
@@ -10,7 +10,7 @@
 - [Prepare new version](#prepare-new-version)
 
 
-General assumption: You are working on branch maintenance, the next version is a bug fix release. For feature releaese it is slightly different.
+General assumption: You are working on branch maintenance, the next version is a bug fix release. For feature releaeses it is slightly different.
 
 ## Check before
 

diff --git a/intelmq/lib/upgrades.py b/intelmq/lib/upgrades.py
@@ -18,7 +18,7 @@
            'v200_defaults_ssl_ca_certificate',
            'v111_defaults_process_manager',
            'v202_fixes',
-           'v210_deprecations_1',
+           'v210_deprecations',
            ]
 
 
@@ -246,7 +246,7 @@ def v202_fixes(defaults, runtime, dry_run):
     return changed, defaults, runtime
 
 
-def v210_deprecations_1(defaults, runtime, dry_run):
+def v210_deprecations(defaults, runtime, dry_run):
     """
     Migrating configuration.
     """
@@ -284,5 +284,5 @@ def v210_deprecations_1(defaults, runtime, dry_run):
                  v200_defaults_ssl_ca_certificate)),
     ((2, 0, 1), ()),
     ((2, 0, 2), (v202_fixes, )),
-    ((2, 1, 0), (v210_deprecations_1, )),
+    ((2, 1, 0), (v210_deprecations, )),
 ])
diff --git a/intelmq/tests/bots/collectors/mail/lib.py b/intelmq/tests/bots/collectors/mail/lib.py
@@ -7,12 +7,12 @@
 """
 import os
 
-
-from imbox.parser import parse_email
-with open(os.path.join(os.path.dirname(__file__), 'foobarzip.eml')) as handle:
-    EMAIL_ZIP_FOOBAR = parse_email(handle.read())
-with open(os.path.join(os.path.dirname(__file__), 'foobartxt.eml')) as handle:
-    EMAIL_TXT_FOOBAR = parse_email(handle.read())
+if os.getenv('INTELMQ_TEST_EXOTIC'):
+    from imbox.parser import parse_email
+    with open(os.path.join(os.path.dirname(__file__), 'foobarzip.eml')) as handle:
+        EMAIL_ZIP_FOOBAR = parse_email(handle.read())
+    with open(os.path.join(os.path.dirname(__file__), 'foobartxt.eml')) as handle:
+        EMAIL_TXT_FOOBAR = parse_email(handle.read())
 
 
 class MockedImbox():

diff --git a/intelmq/tests/lib/test_upgrades.py b/intelmq/tests/lib/test_upgrades.py
@@ -237,7 +237,7 @@ def test_v202_fixes(self):
 
     def test_v210_deprecations(self):
         """ Test v210_deprecations """
-        result = upgrades.v210_deprecations_1({}, V210, True)
+        result = upgrades.v210_deprecations({}, V210, True)
         self.assertTrue(result[0])
         self.assertEqual(V210_EXP, result[2])
 

diff --git a/intelmq/version.py b/intelmq/version.py
@@ -1,2 +1,2 @@
-__version_info__ = (2, 1, 0, 'alpha', 1)
+__version_info__ = (2, 1, 0)
 __version__ = '.'.join(map(str, __version_info__))