[med-svn] [Git][med-team/python-avro][master] 5 commits: routine-update: New upstream version

Nilesh Patra gitlab at salsa.debian.org
Mon Dec 7 20:27:58 GMT 2020



Nilesh Patra pushed to branch master at Debian Med / python-avro


Commits:
b4f01ee3 by Nilesh Patra at 2020-12-08T01:27:24+05:30
routine-update: New upstream version

- - - - -
d5e9014c by Nilesh Patra at 2020-12-08T01:27:25+05:30
New upstream version 1.10.1+dfsg
- - - - -
70e92a3e by Nilesh Patra at 2020-12-08T01:27:27+05:30
Update upstream source from tag 'upstream/1.10.1+dfsg'

Update to upstream version '1.10.1+dfsg'
with Debian dir 250bf120f49654888d021c0e66d806d6074d9fd7
- - - - -
e333ab29 by Nilesh Patra at 2020-12-08T01:27:27+05:30
routine-update: Standards-Version: 4.5.1

- - - - -
1d94c164 by Nilesh Patra at 2020-12-08T01:27:43+05:30
routine-update: Ready to upload to unstable

- - - - -


11 changed files:

- composer.json
- debian/changelog
- debian/control
- doc/examples/java-example/pom.xml
- doc/examples/mr-example/pom.xml
- doc/src/content/xdocs/spec.xml
- lang/py/avro/test/test_tether_task_runner.py
- lang/py/avro/tether/tether_task_runner.py
- pom.xml
- share/VERSION.txt
- share/docker/Dockerfile


Changes:

=====================================
composer.json
=====================================
@@ -4,7 +4,7 @@
   "minimum-stability": "stable",
   "license": "Apache-2.0",
   "require": {
-    "beberlei/composer-monorepo-plugin": "^0.12"
+    "beberlei/composer-monorepo-plugin": "0.16.5"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.1",


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+python-avro (1.10.1+dfsg-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream version
+  * Standards-Version: 4.5.1 (routine-update)
+
+ -- Nilesh Patra <npatra974 at gmail.com>  Tue, 08 Dec 2020 01:27:43 +0530
+
 python-avro (1.10.0+dfsg-1) unstable; urgency=medium
 
   * Team Upload.


=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-all,
                python3-setuptools,
                python3-isort
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/python-avro
 Vcs-Git: https://salsa.debian.org/med-team/python-avro.git
 Homepage: https://avro.apache.org


=====================================
doc/examples/java-example/pom.xml
=====================================
@@ -25,6 +25,9 @@
   <version>1.0-SNAPSHOT</version>
   <name>java-example</name>
   <url>https://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -35,15 +38,24 @@
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>1.7.5</version>
+      <version>1.10.1</version>
     </dependency>
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-maven-plugin</artifactId>
-        <version>1.7.5</version>
+        <version>1.10.1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -59,7 +71,8 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
+        <artifactId>maven-plugin</artifactId>
+        <version>1.10.1</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -79,7 +92,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.avro</groupId>
                     <artifactId>avro-maven-plugin</artifactId>
-                    <versionRange>[1.7.5,)</versionRange>
+                    <versionRange>[1.10.1,)</versionRange>
                     <goals>
                       <goal>schema</goal>
                     </goals>


=====================================
doc/examples/mr-example/pom.xml
=====================================
@@ -27,11 +27,16 @@
 
   <name>mr-example</name>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -40,7 +45,7 @@
       <plugin>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-maven-plugin</artifactId>
-        <version>1.9.0</version>
+        <version>1.10.1</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -68,7 +73,7 @@
                   <pluginExecutionFilter>
                     <groupId>org.apache.avro</groupId>
                     <artifactId>avro-maven-plugin</artifactId>
-                    <versionRange>[1.7.5,)</versionRange>
+                    <versionRange>[1.10.1,)</versionRange>
                     <goals>
                       <goal>schema</goal>
                     </goals>
@@ -89,17 +94,17 @@
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>1.9.0</version>
+      <version>1.10.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro-mapred</artifactId>
-      <version>1.9.0</version>
+      <version>1.10.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
-      <version>3.1.2</version>
+      <version>3.2.1</version>
     </dependency>
   </dependencies>
 </project>


=====================================
doc/src/content/xdocs/spec.xml
=====================================
@@ -222,7 +222,7 @@
     <source>
 {
   "type": "map",
-  "items" : "long",
+  "values" : "long",
   "default": {}
 }
     </source>


=====================================
lang/py/avro/test/test_tether_task_runner.py
=====================================
@@ -66,6 +66,12 @@ class TestTetherTaskRunner(unittest.TestCase):
             runner = avro.tether.tether_task_runner.TaskRunner(avro.test.word_count_task.WordCountTask())
 
             runner.start(outputport=parent_port, join=False)
+            for _ in range(12):
+                if runner.server is not None:
+                    break
+                time.sleep(1)
+            else:
+                raise RuntimeError("Server never started")
 
             # Test sending various messages to the server and ensuring they are processed correctly
             requestor = avro.tether.tether_task.HTTPRequestor(


=====================================
lang/py/avro/tether/tether_task_runner.py
=====================================
@@ -141,6 +141,9 @@ class TaskRunner(object):
     implements the logic for the mapper and reducer phases
     """
 
+    server = None
+    sthread = None
+
     def __init__(self, task):
         """
         Construct the runner
@@ -149,15 +152,11 @@ class TaskRunner(object):
         ---------------------------------------------------------------
         task - An instance of tether task
         """
-
         self.log = logging.getLogger("TaskRunner:")
-
-        if not(isinstance(task, avro.tether.tether_task.TetherTask)):
-            raise ValueError("task must be an instance of tether task")
         self.task = task
 
-        self.server = None
-        self.sthread = None
+        if not isinstance(task, avro.tether.tether_task.TetherTask):
+            raise ValueError("task must be an instance of tether task")
 
     def start(self, outputport=None, join=True):
         """
@@ -175,7 +174,6 @@ class TaskRunner(object):
                     we can resume execution in this thread so that we can do additional
                     testing
         """
-
         port = avro.tether.util.find_port()
         address = ("localhost", port)
 
@@ -189,7 +187,7 @@ class TaskRunner(object):
         sthread.start()
 
         self.sthread = sthread
-        # This needs to run in a separat thread b\c serve_forever() blocks
+        # This needs to run in a separate thread because serve_forever() blocks.
         self.task.open(port, clientPort=outputport)
 
         # wait for the other thread to finish


=====================================
pom.xml
=====================================
@@ -27,7 +27,7 @@
 
   <groupId>org.apache.avro</groupId>
   <artifactId>avro-toplevel</artifactId>
-  <version>1.10.0</version>
+  <version>1.10.1</version>
   <packaging>pom</packaging>
 
   <name>Apache Avro Toplevel</name>
@@ -48,16 +48,16 @@
     <apache-rat-tasks.version>0.7</apache-rat-tasks.version>
 
     <!-- plugin versions -->
-    <antrun-plugin.version>1.8</antrun-plugin.version>
+    <antrun-plugin.version>3.0.0</antrun-plugin.version>
     <checkstyle-plugin.version>3.1.1</checkstyle-plugin.version>
     <enforcer-plugin.version>3.0.0-M3</enforcer-plugin.version>
-    <extra-enforcer-rules.version>1.2</extra-enforcer-rules.version>
+    <extra-enforcer-rules.version>1.3</extra-enforcer-rules.version>
     <gpg-plugin.version>1.6</gpg-plugin.version>
     <javadoc-plugin.version>3.2.0</javadoc-plugin.version>
     <maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
     <rat.version>0.13</rat.version>
     <source-plugin.version>3.2.1</source-plugin.version>
-    <spotless-maven-plugin.version>1.31.0</spotless-maven-plugin.version>
+    <spotless-maven-plugin.version>1.31.1</spotless-maven-plugin.version>
   </properties>
 
   <modules>
@@ -302,6 +302,8 @@
                 <exclude>**/*.egg-info/**</exclude>
                 <exclude>build/**</exclude>
                 <exclude>doc/build/**</exclude>
+                <exclude>doc/examples/java-example/target/**</exclude>
+                <exclude>doc/examples/mr-example/target/**</exclude>
                 <exclude>lang/java/archetypes/**</exclude>
                 <exclude>lang/java/**/target/**</exclude>
                 <exclude>lang/js/node_modules/**</exclude>
@@ -312,6 +314,7 @@
                 <exclude>lang/perl/blib/**/.exists</exclude>
                 <exclude>vendor/**</exclude>
                 <exclude>lang/php/vendor/**</exclude>
+                <exclude>lang/php/.phpunit.result.cache</exclude>
                 <exclude>lang/ruby/Gemfile.lock</exclude>
                 <exclude>lang/ruby/avro.gemspec</exclude>
                 <exclude>lang/ruby/.gem/**</exclude>
@@ -326,6 +329,10 @@
                 <exclude>lang/java/tools/src/test/compiler/output/Player.java</exclude>
                 <exclude>lang/java/tools/src/test/compiler/output/Position.java</exclude>
                 <exclude>lang/java/tools/src/test/compiler/output/FieldVisibilityTest.java</exclude>
+                <exclude>lang/java/tools/src/test/compiler/output/NoSettersTest.java</exclude>
+                <exclude>lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java</exclude>
+                <exclude>lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java</exclude>
+                <exclude>lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java</exclude>
                 <exclude>lang/csharp/build/doc/html/**</exclude>
                 <exclude>lang/csharp/src/apache/ipc.test/GeneratedFiles/**/*.cs</exclude>
                 <exclude>lang/csharp/src/apache/perf/com/foo/*.cs</exclude>


=====================================
share/VERSION.txt
=====================================
@@ -1 +1 @@
-1.10.0
+1.10.1
\ No newline at end of file


=====================================
share/docker/Dockerfile
=====================================
@@ -68,6 +68,7 @@ RUN apt-get -qqy update \
                                                  source-highlight \
                                                  subversion \
                                                  valgrind \
+                                                 vim \
  && apt-get -qqy clean \
  && rm -rf /var/lib/apt/lists
 
@@ -115,11 +116,12 @@ RUN curl -sSL https://packages.sury.org/php/apt.gpg \
  && apt-get -qqy clean \
  && rm -rf /var/lib/apt/lists
 
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN curl -sS https://getcomposer.org/installer | php -- --version=2.0.7 --install-dir=/usr/local/bin --filename=composer
 
 # Install Perl modules
 RUN apt-get -qqy update \
  && apt-get -qqy install --no-install-recommends libcompress-raw-zlib-perl \
+                                                 libcpan-uploader-perl \
                                                  libencode-perl \
                                                  libio-string-perl \
                                                  libjson-xs-perl \



View it on GitLab: https://salsa.debian.org/med-team/python-avro/-/compare/577c0c88e3d9bb55e5b19bc53650caef146e1f55...1d94c16425b55711922a33e4f3f2424dfb79ea9b

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-avro/-/compare/577c0c88e3d9bb55e5b19bc53650caef146e1f55...1d94c16425b55711922a33e4f3f2424dfb79ea9b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201207/29fbecfb/attachment-0001.html>


More information about the debian-med-commit mailing list