[med-svn] [Git][med-team/python-avro][master] 5 commits: New upstream version 1.10.2+dfsg
Nilesh Patra
gitlab at salsa.debian.org
Wed Apr 21 08:14:29 BST 2021
Nilesh Patra pushed to branch master at Debian Med / python-avro
Commits:
dd5cf7c4 by Nilesh Patra at 2021-04-21T12:39:53+05:30
New upstream version 1.10.2+dfsg
- - - - -
68014b29 by Nilesh Patra at 2021-04-21T12:39:56+05:30
Update upstream source from tag 'upstream/1.10.2+dfsg'
Update to upstream version '1.10.2+dfsg'
with Debian dir 49b185efaa6771ac12ee28fe6a69a2fe562d947f
- - - - -
1f1722c0 by Nilesh Patra at 2021-04-21T12:40:27+05:30
Refresh patch
- - - - -
a85ca582 by Nilesh Patra at 2021-04-21T12:43:04+05:30
Bump watch file version to 4
- - - - -
5f1cd6af by Nilesh Patra at 2021-04-21T12:44:09+05:30
Interim changelog entry
- - - - -
18 changed files:
- .travis/before_install.sh
- BUILD.md
- build.sh
- debian/changelog
- debian/patches/remove-un-needed-deps.patch
- debian/watch
- doc/examples/java-example/pom.xml
- doc/examples/mr-example/pom.xml
- doc/src/content/xdocs/spec.xml
- + lang/py/avro/README.md
- lang/py/avro/test/test_tether_task_runner.py
- lang/py/avro/tether/tether_task.py
- lang/py/setup.cfg
- + lang/py3/README.md
- − lang/py3/README.txt
- lang/py3/setup.cfg
- pom.xml
- share/VERSION.txt
Changes:
=====================================
.travis/before_install.sh
=====================================
@@ -25,7 +25,7 @@ case "$TRAVIS_OS_NAME" in
sudo rm -rf /var/lib/apt/lists/*
# Only Yetus 0.9.0+ supports `ADD` and `COPY` commands in Dockerfile
- curl -L https://www-us.apache.org/dist/yetus/0.10.0/apache-yetus-0.10.0-bin.tar.gz | tar xvz -C /tmp/
+ curl -L https://archive.apache.org/dist/yetus/0.10.0/apache-yetus-0.10.0-bin.tar.gz | tar xvz -C /tmp/
# A dirty workaround to disable the Yetus robot for TravisCI,
# since it'll cancel the changes that .travis/script.sh will do,
# even if the `--dirty-workspace` option is specified.
=====================================
BUILD.md
=====================================
@@ -23,8 +23,11 @@ The following packages must be installed before Avro can be built:
- Apache Forrest 0.9 (for documentation)
- md5sum, sha1sum, used by top-level dist target
-To simplify this, you can run a Docker container with all the above
-dependencies installed by installing Docker and run:
+## Using docker
+
+It can be simpler to use a Docker image with all of the requirements already
+installed. If you have Docker installed on your host machine, you can build
+inside a container by running:
```bash
./build.sh docker
@@ -43,6 +46,21 @@ The working directory in the container is mounted from your host. This
allows you to access the files in your Avro development tree from the
Docker container.
+There are some additional `DOCKER_` environment variables described in
+[build.sh](./build.sh) that can be used to interact with the image using
+the build script. Some examples:
+
+```bash
+# Rebuild the docker image without using the build cache.
+DOCKER_BUILD_XTRA_ARGS=--no-cache ./build.sh docker
+
+# Build a docker image with a specific tag (for an RC or poc, for example)
+DOCKER_IMAGE_NAME=avro-build:1.10.1-rc1 ./build.sh docker
+
+# Run a command and return.
+DOCKER_RUN_ENTRYPOINT="mvn --version" ./build.sh docker
+```
+
## Building
Once the requirements are installed (or from the Docker container),
=====================================
build.sh
=====================================
@@ -43,7 +43,15 @@ set -xe
cd "${0%/*}"
VERSION=$(<share/VERSION.txt)
-DOCKER_XTRA_ARGS=""
+
+# Extra flags to add to the docker run command. This can be overridden using the --args argument.
+DOCKER_RUN_XTRA_ARGS=${DOCKER_RUN_XTRA_ARGS-}
+# The entrypoint when running the avro docker from this script.
+DOCKER_RUN_ENTRYPOINT=${DOCKER_RUN_ENTRYPOINT-bash}
+# Extra flags to add to the docker build command.
+DOCKER_BUILD_XTRA_ARGS=${DOCKER_BUILD_XTRA_ARGS-}
+# Override the docker image name used.
+DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME-}
usage() {
echo "Usage: $0 {lint|test|dist|sign|clean|veryclean|docker [--args \"docker-args\"]|rat|githooks|docker-test}"
@@ -280,7 +288,7 @@ do
docker)
if [[ $1 =~ ^--args ]]; then
- DOCKER_XTRA_ARGS=$2
+ DOCKER_RUN_XTRA_ARGS=$2
shift 2
fi
if [[ "$(uname -s)" = Linux ]]; then
@@ -292,6 +300,7 @@ do
USER_ID=1000
GROUP_ID=50
fi
+ DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-"avro-build-$USER_NAME:latest"}
{
cat share/docker/Dockerfile
grep -vF 'FROM avro-build-ci' share/docker/DockerfileLocal
@@ -299,7 +308,8 @@ do
echo "RUN getent group $GROUP_ID || groupadd -g $GROUP_ID $USER_NAME"
echo "RUN getent passwd $USER_ID || useradd -g $GROUP_ID -u $USER_ID -k /root -m $USER_NAME"
} > Dockerfile
- tar -cf- lang/ruby/Gemfile Dockerfile | docker build -t "avro-build-$USER_NAME" -
+ # shellcheck disable=SC2086
+ tar -cf- lang/ruby/Gemfile Dockerfile | docker build $DOCKER_BUILD_XTRA_ARGS -t "$DOCKER_IMAGE_NAME" -
rm Dockerfile
# By mapping the .m2 directory you can do an mvn install from
# within the container and use the result on your normal
@@ -311,6 +321,7 @@ do
# Using :delegated will drop the "mvn install" time from over 30 minutes
# down to under 10. However, editing files from OSX may take a few
# extra second before the changes are available within the docker container.
+ # shellcheck disable=SC2086
docker run --rm -t -i \
--env "JAVA=${JAVA:-8}" \
--user "${USER_NAME}" \
@@ -318,8 +329,7 @@ do
--volume "${HOME}/.m2:/home/${USER_NAME}/.m2${DOCKER_MOUNT_FLAG}" \
--volume "${PWD}:/home/${USER_NAME}/avro${DOCKER_MOUNT_FLAG}" \
--workdir "/home/${USER_NAME}/avro" \
- ${DOCKER_XTRA_ARGS} \
- "avro-build-${USER_NAME}" bash
+ ${DOCKER_RUN_XTRA_ARGS} "$DOCKER_IMAGE_NAME" ${DOCKER_RUN_ENTRYPOINT}
;;
rat)
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+python-avro (1.10.2+dfsg-1) UNRELEASED; urgency=medium
+
+ * Team Upload.
+ * New upstream version 1.10.2+dfsg
+ * Refresh patch
+ * Bump watch file version to 4
+
+ -- Nilesh Patra <nilesh at debian.org> Wed, 21 Apr 2021 12:43:27 +0530
+
python-avro (1.10.1+dfsg-1) unstable; urgency=medium
* Team upload.
=====================================
debian/patches/remove-un-needed-deps.patch
=====================================
@@ -3,7 +3,7 @@ Last-Update: 2020-09-22
Description: Remove lint operation since this is of no real use to us.
--- a/lang/py3/setup.cfg
+++ b/lang/py3/setup.cfg
-@@ -44,7 +44,6 @@
+@@ -45,7 +45,6 @@
packages = avro
setup_requires =
isort
=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
+version=4
opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg$//,uversionmangle=s/\-(alpha|beta|rc)(\d)?/\~$1$2/,filenamemangle=s/(?:.*?)?(\d.*)\.tar\.gz/python-avro-$1.tar.gz/" \
https://github.com/apache/avro/releases (?:.*?)?release\-(\d[\d\.]*\-?(?:alpha|beta|rc)?\d?)\.tar\.gz
=====================================
doc/examples/java-example/pom.xml
=====================================
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.10.1</version>
+ <version>1.10.2</version>
</dependency>
</dependencies>
<build>
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
- <version>1.10.1</version>
+ <version>1.10.2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -72,7 +72,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin</artifactId>
- <version>1.10.1</version>
+ <version>1.10.2</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -92,7 +92,7 @@
<pluginExecutionFilter>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
- <versionRange>[1.10.1,)</versionRange>
+ <versionRange>[1.10.2,)</versionRange>
<goals>
<goal>schema</goal>
</goals>
=====================================
doc/examples/mr-example/pom.xml
=====================================
@@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
- <version>1.10.1</version>
+ <version>1.10.2</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -73,7 +73,7 @@
<pluginExecutionFilter>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
- <versionRange>[1.10.1,)</versionRange>
+ <versionRange>[1.10.2,)</versionRange>
<goals>
<goal>schema</goal>
</goals>
@@ -94,12 +94,12 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.10.1</version>
+ <version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-mapred</artifactId>
- <version>1.10.1</version>
+ <version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
=====================================
doc/src/content/xdocs/spec.xml
=====================================
@@ -104,14 +104,17 @@
for users (optional).</li>
<li><code>type:</code> a <a href="#schemas">schema</a>, as defined above</li>
<li><code>default:</code> A default value for this
- field, used when reading instances that lack this
- field (optional). Permitted values depend on the
- field's schema type, according to the table below.
- Default values for union fields correspond to the
- first schema in the union. Default values for bytes
- and fixed fields are JSON strings, where Unicode
- code points 0-255 are mapped to unsigned 8-bit byte
- values 0-255.
+ field, only used when reading instances that lack
+ the field for schema evolution purposes. The
+ presence of a default value does not make the
+ field optional at encoding time. Permitted values
+ depend on the field's schema type, according to the
+ table below. Default values for union fields correspond
+ to the first schema in the union. Default values for bytes
+ and fixed fields are JSON strings, where Unicode
+ code points 0-255 are mapped to unsigned 8-bit byte
+ values 0-255. Avro encodes a field even if its
+ value is equal to its default.
<table class="right">
<caption>field default values</caption>
<tr><th>avro type</th><th>json type</th><th>example</th></tr>
@@ -564,7 +567,7 @@
followed by the serialized string:
<source>02 02 61</source></li>
</ul>
- <p><em>NOTE</em>: Currently for C/C++ implementtions, the positions are practically an int, but theoretically a long.
+ <p><em>NOTE</em>: Currently for C/C++ implementations, the positions are practically an int, but theoretically a long.
In reality, we don't expect unions with 215M members </p>
</section>
=====================================
lang/py/avro/README.md
=====================================
@@ -0,0 +1,18 @@
+## Apache Avro™
+
+Apache Avro™ is a data serialization system. To learn more, please visit our [website](https://avro.apache.org/).
+
+
+### Documentation
+
+Apache Avro documentation is maintained on our [wiki](https://cwiki.apache.org/confluence/display/AVRO/Index).
+
+
+### Contributing
+
+To contribute to Avro, please read [How to Contribute](https://cwiki.apache.org/confluence/display/AVRO/How+To+Contribute) on the wiki.
+
+
+### License, Credits and Acknowledgements
+
+License, credits and acknowledgements are maintained in the [LICENSE.txt](https://github.com/apache/avro/blob/master/LICENSE.txt) and [NOTICE.txt](https://github.com/apache/avro/blob/master/NOTICE.txt) in the source code repository. Those files are also included with the installed package.
=====================================
lang/py/avro/test/test_tether_task_runner.py
=====================================
@@ -133,7 +133,7 @@ class TestTetherTaskRunner(unittest.TestCase):
time.sleep(1)
# make sure the other thread terminated
- self.assertFalse(sthread.isAlive())
+ self.assertFalse(sthread.is_alive())
# shutdown the logging
logging.shutdown()
=====================================
lang/py/avro/tether/tether_task.py
=====================================
@@ -54,7 +54,7 @@ if (inputProtocol is None):
taskschema = inputProtocol.types_dict["TaskType"]
# Mypy cannot statically type check a dynamically constructed named tuple.
# Since InputProtocol.avpr is hard-coded here, we can hard-code the symbols.
- _ttype = collections.namedtuple("_tasktype", ("MAP", "REDUCE"))
+ _ttype = collections.namedtuple("_ttype", ("MAP", "REDUCE"))
TaskType = _ttype(*taskschema.symbols)
if (outputProtocol is None):
=====================================
lang/py/setup.cfg
=====================================
@@ -20,7 +20,7 @@
name = avro
version = file: avro/VERSION.txt
description = Avro is a serialization and RPC framework.
-long_description = file: README.txt
+long_description = file: avro/README.md
keywords =
avro
serialization
@@ -36,6 +36,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
+ Development Status :: 5 - Production/Stable
[options]
packages =
@@ -57,9 +58,10 @@ python_requires = >=2.7
avro =
HandshakeRequest.avsc
HandshakeResponse.avsc
- VERSION.txt
LICENSE
NOTICE
+ README.md
+ VERSION.txt
avro.tether =
InputProtocol.avpr
OutputProtocol.avpr
=====================================
lang/py3/README.md
=====================================
@@ -0,0 +1,22 @@
+# Deprecation Notice
+
+[avro-python3](https://pypi.org/project/avro-python3/) is no longer maintained and is deprecated in favor of [avro](https://pypi.org/project/avro/). Avro is maintained and has full support for recent versions of Python..
+
+## Apache Avro™
+
+Apache Avro™ is a data serialization system. To learn more, please visit our [website](https://avro.apache.org/).
+
+
+### Documentation
+
+Apache Avro documentation is maintained on our [wiki](https://cwiki.apache.org/confluence/display/AVRO/Index).
+
+
+### Contributing
+
+To contribute to Avro, please read [How to Contribute](https://cwiki.apache.org/confluence/display/AVRO/How+To+Contribute) on the wiki.
+
+
+### License, Credits and Acknowledgements
+
+License, credits and acknowledgements are maintained in the [LICENSE.txt](https://github.com/apache/avro/blob/master/LICENSE.txt) and [NOTICE.txt](https://github.com/apache/avro/blob/master/NOTICE.txt) in the source code repository. Those files are also included with the installed package.
=====================================
lang/py3/README.txt deleted
=====================================
@@ -1,13 +0,0 @@
-Apache Avro™ is a data serialization system.
-
-Learn more about Avro, please visit our website at:
-
- https://avro.apache.org/
-
-To contribute to Avro, please read:
-
- https://cwiki.apache.org/confluence/display/AVRO/How+To+Contribute
-
-For LICENSE and NOTICE information for the python3 implementation, see:
-* avro/LICENSE
-* avro/NOTICE
=====================================
lang/py3/setup.cfg
=====================================
@@ -20,7 +20,7 @@
name = avro-python3
version = file: avro/VERSION.txt
description = Avro is a serialization and RPC framework.
-long_description = file: README.txt
+long_description = file: README.md
keywords =
avro
serialization
@@ -36,6 +36,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
+ Development Status :: 7 - Inactive
[options]
package_dir =
=====================================
pom.xml
=====================================
@@ -27,7 +27,7 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro-toplevel</artifactId>
- <version>1.10.1</version>
+ <version>1.10.2</version>
<packaging>pom</packaging>
<name>Apache Avro Toplevel</name>
@@ -40,24 +40,17 @@
Java artifacts are copied to the final build destination with a custom profile.
-->
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<main.basedir>${project.basedir}</main.basedir>
<avro.distDir>dist</avro.distDir>
<avro.docDir>build/avro-doc-${project.version}/api</avro.docDir>
- <!-- dependency plugin versions -->
- <apache-rat-tasks.version>0.7</apache-rat-tasks.version>
-
<!-- plugin versions -->
<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.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.1</spotless-maven-plugin.version>
+ <plugin-tools-javadoc.version>3.5</plugin-tools-javadoc.version>
+ <extra-enforcer-rules.version>1.3</extra-enforcer-rules.version>
</properties>
<modules>
@@ -115,7 +108,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>${enforcer-plugin.version}</version>
<executions>
<execution>
<id>enforce-maven-version</id>
@@ -178,7 +170,6 @@
</plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <version>${maven-plugin-plugin.version}</version>
<configuration>
<goalPrefix>avro</goalPrefix>
</configuration>
@@ -195,7 +186,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin.version}</version>
<executions>
<execution>
<!-- build javadoc jars per jar for publishing to maven -->
@@ -221,7 +211,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>${source-plugin.version}</version>
<executions>
<execution>
<!-- builds source jars and attaches them to the project for publishing -->
@@ -243,7 +232,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>${gpg-plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -267,7 +255,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>${rat.version}</version>
<inherited>false</inherited>
<executions>
<execution>
@@ -325,6 +312,7 @@
<exclude>lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Player.java</exclude>
<exclude>lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Position.java</exclude>
<exclude>lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/FieldTest.java</exclude>
+ <exclude>lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Proto.java</exclude>
<exclude>lang/java/tools/src/test/compiler/output-string/Position.java</exclude>
<exclude>lang/java/tools/src/test/compiler/output/Player.java</exclude>
<exclude>lang/java/tools/src/test/compiler/output/Position.java</exclude>
@@ -389,6 +377,7 @@
<exclude>lang/perl/inc/Module/Install.pm</exclude>
<exclude>lang/perl/inc/Module/Install/*.pm</exclude>
<exclude>lang/py/.eggs/**</exclude>
+ <exclude>lang/py/.mypy_cache/**</exclude>
<exclude>lang/py/.tox/**</exclude>
<exclude>lang/py/build/**</exclude>
<exclude>lang/py/dist/**</exclude>
@@ -433,7 +422,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>${antrun-plugin.version}</version>
<configuration>
<target name="copy-java-artifacts">
<mkdir dir="${avro.distDir}/java"/>
=====================================
share/VERSION.txt
=====================================
@@ -1 +1 @@
-1.10.1
\ No newline at end of file
+1.10.2
\ No newline at end of file
View it on GitLab: https://salsa.debian.org/med-team/python-avro/-/compare/1d94c16425b55711922a33e4f3f2424dfb79ea9b...5f1cd6aff4ee8e0efb43dfa7ed457198cf660882
--
View it on GitLab: https://salsa.debian.org/med-team/python-avro/-/compare/1d94c16425b55711922a33e4f3f2424dfb79ea9b...5f1cd6aff4ee8e0efb43dfa7ed457198cf660882
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/20210421/52448411/attachment-0001.htm>
More information about the debian-med-commit
mailing list