summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaawda2017-07-24 00:23:01 +0200
committerhaawda2017-07-24 00:23:01 +0200
commit65f2df2a68f7c26be6fff4ef3983ddf5102ffce9 (patch)
tree1b97ba5b62c9f86add31381479ac03f68a2e5466
parent7c7572d7a6a8c75ab3a731ac3ac4ae81ab8b9c84 (diff)
downloadaur-65f2df2a68f7c26be6fff4ef3983ddf5102ffce9.tar.gz
Updated version (1.2.0b1.8.g91e3c36e4 -> 1.2.0b1.9.g39c72682b).
Changelog ========= - move to file-per-changelog for unreleased change notes, so that we no longer have to rely upon merges within the changelog files. because gerrit doesn't allow us to use custom merge engines unlike git, we have no ability to merge multiple changes into the changelog files without going through conflicts. new version of changelog in git supports these new patterns. (39c72682b) Merge "Check for column object in eval_none, not propkey" (91e3c36e4) Check for column object in eval_none, not propkey (7628ff39d) Check for non-entity when inspecting for subqueryload (3d41ea09a) Merge branch 'patch-1' of https://github.com/tomsitter/sqlalchemy (32f67637c) Merge branch 'patch-2' of https://github.com/pablogamboa/sqlalchemy (2eeea0397) - 1.2.0b2 placeholder (3cb29af87) Replace Session class with session instance (43f41fbfa) Fix typo, foriegn -> foreign (c6b467598)
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e7ece5f31bb7..6539b372571e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Jul 20 01:52:48 UTC 2017
+# Sun Jul 23 22:23:00 UTC 2017
pkgbase = python-sqlalchemy-git
pkgdesc = Python SQL toolkit and Object Relational Mapper
- pkgver = 1.2.0b1.8.g91e3c36e4
+ pkgver = 1.2.0b1.9.g39c72682b
pkgrel = 1
url = http://www.sqlalchemy.org
arch = i686
@@ -11,7 +11,7 @@ pkgbase = python-sqlalchemy-git
makedepends = git
makedepends = python-setuptools
depends = python
- provides = python-sqlalchemy=1.2.0b1.8.g91e3c36e4
+ provides = python-sqlalchemy=1.2.0b1.9.g39c72682b
conflicts = python-sqlalchemy
source = git+https://bitbucket.org/zzzeek/sqlalchemy.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 720d86319d59..63a737093063 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=python-sqlalchemy-git
-pkgver=1.2.0b1.8.g91e3c36e4
+pkgver=1.2.0b1.9.g39c72682b
pkgrel=1
pkgdesc="Python SQL toolkit and Object Relational Mapper"
arch=('i686' 'x86_64')