Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apache/avro
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: postmates/avro
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Apr 6, 2017

  1. Copy the full SHA
    cebef02 View commit details

Commits on Aug 11, 2017

  1. add timezones.py file

    abrarsheikh committed Aug 11, 2017
    Copy the full SHA
    c250b64 View commit details
  2. fix init file in py

    abrarsheikh committed Aug 11, 2017
    Copy the full SHA
    fa3300b View commit details

Commits on Dec 20, 2017

  1. Change validate to throw an exception on direct error (#1)

    * Change validate to throw an exception on direct error
    
    * Revert msg change
    cvanderschuere authored Dec 20, 2017
    Copy the full SHA
    d2502a1 View commit details
  2. Copy the full SHA
    29fe204 View commit details

Commits on Apr 24, 2018

  1. Merge pull request #1 from apache/master

    merge in latest master from apache/avro
    Joe Astrauskas authored Apr 24, 2018
    Copy the full SHA
    5ccf162 View commit details

Commits on Apr 25, 2018

  1. Merge pull request #2 from joe-astr/time_logical_type

    Time logical type
    Joe Astrauskas authored Apr 25, 2018
    Copy the full SHA
    6467bc4 View commit details
  2. remove timezone checking

    Joe Astrauskas committed Apr 25, 2018
    Copy the full SHA
    a7c449e View commit details

Commits on Apr 26, 2018

  1. fix tests, cleanup

    Joe Astrauskas committed Apr 26, 2018
    Copy the full SHA
    c1be8a7 View commit details
  2. remove timezones.py

    Joe Astrauskas committed Apr 26, 2018
    Copy the full SHA
    5fed0b8 View commit details
  3. cleanup

    Joe Astrauskas committed Apr 26, 2018
    Copy the full SHA
    3475331 View commit details
  4. remove timezone imports

    Joe Astrauskas committed Apr 26, 2018
    Copy the full SHA
    3e2698e View commit details
  5. ignore unspecified logical types, update tests

    Joe Astrauskas committed Apr 26, 2018
    Copy the full SHA
    0069959 View commit details
  6. Merge pull request #3 from joe-astr/joe/changes

    Changes to Yelp timestamp logical-type support:
    
    * removed timezone aware datetimes (because current postal-main events use naive datetimes, which don't play well with timezones)
    
    * ignore unknown logical types (like uuid) per the spec: http://avro.apache.org/docs/current/spec.html#Logical+Types
    Joe Astrauskas authored Apr 26, 2018
    Copy the full SHA
    d039967 View commit details
  7. Copy the full SHA
    76518e0 View commit details

Commits on Apr 27, 2018

  1. Merge pull request #2 from postmates/joe/sync-upstream

    Sync with upstream
    Joe Astrauskas authored Apr 27, 2018
    Copy the full SHA
    dbede85 View commit details

Commits on Apr 30, 2018

  1. Merge branch 'master' into joe/timestamp-updates

    Joe Astrauskas authored Apr 30, 2018
    Copy the full SHA
    d6a3e50 View commit details

Commits on May 1, 2018

  1. long/timestamp compatibility fix

    Joe Astrauskas committed May 1, 2018
    Copy the full SHA
    1b97e52 View commit details

Commits on May 8, 2018

  1. serialization of python Decimal objects

    Joe Astrauskas committed May 8, 2018
    Copy the full SHA
    6fb85f9 View commit details

Commits on May 9, 2018

  1. add more tests

    Joe Astrauskas committed May 9, 2018
    Copy the full SHA
    cebedd2 View commit details

Commits on May 14, 2018

  1. typo

    Joe Astrauskas committed May 14, 2018
    Copy the full SHA
    483811d View commit details
  2. Merge pull request #4 from joe-astr/joe/timestamp-updates

    Adding avro timestamp to python datetime support
    Joe Astrauskas authored May 14, 2018
    Copy the full SHA
    99e2c5f View commit details

Commits on May 16, 2018

  1. postmates local version (#5)

    * postmates local version
    
    * local version for py3
    
    * remove usage of ReadVersion
    Joe Astrauskas authored May 16, 2018
    Copy the full SHA
    5c539ca View commit details

Commits on Jul 31, 2020

  1. Add CodeQL Analysis workflow

    David Ross committed Jul 31, 2020
    Copy the full SHA
    eae28fd View commit details
  2. Merge pull request #8 from postmates/enable-semmle-dr1

    Add CodeQL Analysis workflow
    randomdross authored Jul 31, 2020
    Copy the full SHA
    b159277 View commit details

Commits on Oct 21, 2020

  1. [dependathon] bump java dependencies

    Stefan Bacon committed Oct 21, 2020
    Copy the full SHA
    318fa45 View commit details

Commits on Oct 26, 2020

  1. Merge pull request #11 from postmates/stefan/dependathon/bump_java_de…

    …pendencies
    
    [dependathon] bump jetty and commons-compress
    Stefan Bacon authored Oct 26, 2020
    Copy the full SHA
    425d2ac View commit details
4 changes: 4 additions & 0 deletions .github/codeql/codeql-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
name: "CodeQL config"

queries:
- uses: security-extended
53 changes: 53 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: "Code scanning - action"

on:
push:
branches: [master, ]
schedule:
- cron: '0 8 * * 2'

jobs:
CodeQL-Build:

runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java
with:
config-file: ./.github/codeql/codeql-config.yml

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
4 changes: 2 additions & 2 deletions lang/java/pom.xml
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@

<hadoop2.version>2.7.3</hadoop2.version>
<jackson.version>1.9.13</jackson.version>
<jetty.version>9.4.6.v20170531</jetty.version>
<jetty.version>9.4.32.v20200930</jetty.version>
<jopt-simple.version>5.0.3</jopt-simple.version>
<junit.version>4.12</junit.version>
<netty.version>3.10.6.Final</netty.version>
@@ -54,7 +54,7 @@
<ant.version>1.10.0</ant.version>
<commons-cli.version>1.3.1</commons-cli.version>
<commons-codec.version>1.10</commons-codec.version>
<commons-compress.version>1.13</commons-compress.version>
<commons-compress.version>1.20</commons-compress.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-logging.version>1.2</commons-logging.version>
<tukaani.version>1.6</tukaani.version>
6 changes: 3 additions & 3 deletions lang/py/setup.py
Original file line number Diff line number Diff line change
@@ -7,9 +7,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@

setup(
name = 'avro',
version = '@AVRO_VERSION@',
version = '1.8.2+postmates.1',
packages = ['avro',],
package_dir = {'avro': 'src/avro'},
scripts = ["./scripts/avro"],
7 changes: 3 additions & 4 deletions lang/py/src/avro/__init__.py
Original file line number Diff line number Diff line change
@@ -5,14 +5,13 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__all__ = ['schema', 'io', 'datafile', 'protocol', 'ipc']

__all__ = ['schema', 'io', 'datafile', 'protocol', 'ipc', 'constants']
35 changes: 35 additions & 0 deletions lang/py/src/avro/constants.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""
Contains Constants for Python Avro
"""

DATE = "date"
TIME_MILLIS = "time-millis"
TIME_MICROS = "time-micros"
TIMESTAMP_MILLIS = "timestamp-millis"
TIMESTAMP_MICROS = "timestamp-micros"

DECIMAL = "decimal"

SUPPORTED_LOGICAL_TYPE = [
DATE,
TIME_MILLIS,
TIME_MICROS,
TIMESTAMP_MILLIS,
TIMESTAMP_MICROS
]
Loading