aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kevi...@apache.org
Subject git commit: Pin master to -SNAPSHOT and -dev versions.
Date Fri, 13 Dec 2013 01:48:25 GMT
Updated Branches:
  refs/heads/master 5da999254 -> ff5d993d0


Pin master to -SNAPSHOT and -dev versions.

Ensure that we don't inadvertendly publish artifacts that aren't
final tagged versions. A future review will introduce tooling to
automatically and atomically increment these version numbers.

Testing Done:
% ./gradlew publishToMavenLocal
% ./pants setup_py src/main/python/twitter/aurora/config:config-packaged

Bugs closed: AURORA-10

Reviewed at https://reviews.apache.org/r/16228/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/ff5d993d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/ff5d993d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/ff5d993d

Branch: refs/heads/master
Commit: ff5d993d07a0c63217f280f2e5d3ad78d387bd78
Parents: 5da9992
Author: Kevin Sweeney <kevints@apache.org>
Authored: Thu Dec 12 17:48:02 2013 -0800
Committer: Kevin Sweeney <ksweeney@twitter.com>
Committed: Thu Dec 12 17:48:02 2013 -0800

----------------------------------------------------------------------
 .auroraversion                                   | 1 +
 build.gradle                                     | 2 +-
 src/main/python/twitter/aurora/client/BUILD      | 4 +++-
 src/main/python/twitter/aurora/config/BUILD      | 6 ++++--
 src/main/python/twitter/aurora/executor/BUILD    | 4 +++-
 src/main/python/twitter/thermos/BUILD            | 4 +++-
 src/main/python/twitter/thermos/common/BUILD     | 4 +++-
 src/main/python/twitter/thermos/config/BUILD     | 4 +++-
 src/main/python/twitter/thermos/core/BUILD       | 4 +++-
 src/main/python/twitter/thermos/monitoring/BUILD | 4 +++-
 src/main/python/twitter/thermos/observer/BUILD   | 4 +++-
 src/main/thrift/com/twitter/aurora/gen/BUILD     | 4 +++-
 src/main/thrift/com/twitter/thermos/BUILD        | 4 +++-
 13 files changed, 36 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/.auroraversion
----------------------------------------------------------------------
diff --git a/.auroraversion b/.auroraversion
new file mode 100644
index 0000000..d144648
--- /dev/null
+++ b/.auroraversion
@@ -0,0 +1 @@
+0.2.0-SNAPSHOT

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index c66afa8..1c80b6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,7 +31,7 @@ publishing {
     maven(MavenPublication) {
       groupId 'com.twitter.aurora'
       artifactId 'twitter-aurora'
-      version '0.0.12'
+      version file('.auroraversion').text.trim().toUpperCase()
 
       from components.java
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/src/main/python/twitter/aurora/client/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/aurora/client/BUILD b/src/main/python/twitter/aurora/client/BUILD
index a96a801..70eef2e 100644
--- a/src/main/python/twitter/aurora/client/BUILD
+++ b/src/main/python/twitter/aurora/client/BUILD
@@ -1,3 +1,5 @@
+import os
+
 # Create an alias for the previous target
 python_library(
   name = 'api',
@@ -68,7 +70,7 @@ python_library(
   ],
   provides = setup_py(
     name = 'twitter.aurora.client',
-    version = '0.1.2',
+    version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
   ).with_binaries(
     aurora_admin = pants('src/main/python/twitter/aurora/client/bin:aurora_admin'),
     aurora_client = pants('src/main/python/twitter/aurora/client/bin:aurora_client'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/src/main/python/twitter/aurora/config/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/aurora/config/BUILD b/src/main/python/twitter/aurora/config/BUILD
index 0462158..91cb3e4 100644
--- a/src/main/python/twitter/aurora/config/BUILD
+++ b/src/main/python/twitter/aurora/config/BUILD
@@ -1,3 +1,5 @@
+import os
+
 # Alias for src/main/python/twitter/aurora/config/schema
 python_library(
   name = 'schema',
@@ -34,8 +36,8 @@ python_library(
   ],
   provides = setup_py(
     name = 'twitter.aurora.config',
-    version = '0.1.2',
+    version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
     description = 'Aurora/Thermos Pystachio schemas for describing job configurations.',
     license = 'Apache License, Version 2.0',
   )
-)
\ No newline at end of file
+)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/src/main/python/twitter/aurora/executor/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/aurora/executor/BUILD b/src/main/python/twitter/aurora/executor/BUILD
index 02d34f0..01701e9 100644
--- a/src/main/python/twitter/aurora/executor/BUILD
+++ b/src/main/python/twitter/aurora/executor/BUILD
@@ -1,3 +1,5 @@
+import os
+
 python_library(
   name = 'thermos_task_runner',
   sources = ['thermos_task_runner.py'],
@@ -128,7 +130,7 @@ python_library(
   ],
   provides = setup_py(
     name = 'twitter.aurora.executor',
-    version = '0.1.3',
+    version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
   ).with_binaries(
     gc_executor = pants('src/main/python/twitter/aurora/executor/bin:gc_executor'),
     thermos_executor = pants('src/main/python/twitter/aurora/executor/bin:thermos_executor'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/src/main/python/twitter/thermos/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/thermos/BUILD b/src/main/python/twitter/thermos/BUILD
index 7c5d760..937bcf3 100644
--- a/src/main/python/twitter/thermos/BUILD
+++ b/src/main/python/twitter/thermos/BUILD
@@ -1,3 +1,5 @@
+import os
+
 page(name = 'readme', source = 'README.md')
 
 python_library(
@@ -8,7 +10,7 @@ python_library(
   ],
   provides = setup_py(
     name = 'twitter.thermos',
-    version = '0.1.0',
+    version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
     descripton = 'The Twitter Thermos runtime.',
   ).with_binaries(
     thermos = pants('src/main/python/twitter/thermos/bin:thermos'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/src/main/python/twitter/thermos/common/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/thermos/common/BUILD b/src/main/python/twitter/thermos/common/BUILD
index 38de710..d97c771 100644
--- a/src/main/python/twitter/thermos/common/BUILD
+++ b/src/main/python/twitter/thermos/common/BUILD
@@ -1,3 +1,5 @@
+import os
+
 python_library(
   name = 'ckpt',
   sources = ['ckpt.py'],
@@ -37,7 +39,7 @@ python_library(
   ],
   provides = setup_py(
     name = 'twitter.thermos.common',
-    version = '0.1.1',
+    version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
     description = 'Thermos common libraries.',
   )
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/src/main/python/twitter/thermos/config/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/thermos/config/BUILD b/src/main/python/twitter/thermos/config/BUILD
index 7b889d2..57e7f0d 100644
--- a/src/main/python/twitter/thermos/config/BUILD
+++ b/src/main/python/twitter/thermos/config/BUILD
@@ -1,3 +1,5 @@
+import os
+
 python_library(
   name = 'schema',
   sources = globs('*.py'),
@@ -16,7 +18,7 @@ python_library(
   ],
   provides = setup_py(
     name = 'twitter.thermos.config',
-    version = '0.1.1',
+    version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
     description = 'Thermos configuration schema and loader.',
   )
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/src/main/python/twitter/thermos/core/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/thermos/core/BUILD b/src/main/python/twitter/thermos/core/BUILD
index 014b1f7..d260112 100644
--- a/src/main/python/twitter/thermos/core/BUILD
+++ b/src/main/python/twitter/thermos/core/BUILD
@@ -1,3 +1,5 @@
+import os
+
 python_library(
   name = 'helper',
   sources = ['helper.py'],
@@ -80,7 +82,7 @@ python_library(
   ],
   provides = setup_py(
     name = 'twitter.thermos.core',
-    version = '0.1.1',
+    version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
     description = 'The Thermos core state machine.',
   )
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/src/main/python/twitter/thermos/monitoring/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/thermos/monitoring/BUILD b/src/main/python/twitter/thermos/monitoring/BUILD
index 8601c4e..a977878 100644
--- a/src/main/python/twitter/thermos/monitoring/BUILD
+++ b/src/main/python/twitter/thermos/monitoring/BUILD
@@ -1,3 +1,5 @@
+import os
+
 python_library(
   name = 'detector',
   sources = ['detector.py'],
@@ -89,7 +91,7 @@ python_library(
   ],
   provides = setup_py(
     name = 'twitter.thermos.monitoring',
-    version = '0.1.1',
+    version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
     description = 'Thermos monitoring library.',
   )
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/src/main/python/twitter/thermos/observer/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/thermos/observer/BUILD b/src/main/python/twitter/thermos/observer/BUILD
index 090d3ad..00ea9cb 100644
--- a/src/main/python/twitter/thermos/observer/BUILD
+++ b/src/main/python/twitter/thermos/observer/BUILD
@@ -1,3 +1,5 @@
+import os
+
 python_library(
   name = 'observed_task',
   sources = ['observed_task.py'],
@@ -41,7 +43,7 @@ python_library(
   ],
   provides = setup_py(
     name = 'twitter.thermos.observer',
-    version = '0.1.1',
+    version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
     description = 'The Thermos observer web interface.',
   ).with_binaries(
     thermos_observer = pants('src/main/python/twitter/thermos/observer/bin:thermos_observer'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/src/main/thrift/com/twitter/aurora/gen/BUILD
----------------------------------------------------------------------
diff --git a/src/main/thrift/com/twitter/aurora/gen/BUILD b/src/main/thrift/com/twitter/aurora/gen/BUILD
index a21f2fc..33e94ab 100644
--- a/src/main/thrift/com/twitter/aurora/gen/BUILD
+++ b/src/main/thrift/com/twitter/aurora/gen/BUILD
@@ -1,3 +1,5 @@
+import os
+
 # Copyright 2013 Twitter, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,7 +44,7 @@ python_library(
   ],
   provides = setup_py(
     name = 'twitter.gen.aurora',
-    version = '0.1.0',
+    version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
     description = 'Autogenerated Aurora thrift schemas.',
   )
 )

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ff5d993d/src/main/thrift/com/twitter/thermos/BUILD
----------------------------------------------------------------------
diff --git a/src/main/thrift/com/twitter/thermos/BUILD b/src/main/thrift/com/twitter/thermos/BUILD
index c224d8d..2c9a216 100644
--- a/src/main/thrift/com/twitter/thermos/BUILD
+++ b/src/main/thrift/com/twitter/thermos/BUILD
@@ -1,9 +1,11 @@
+import os
+
 python_thrift_library(
   name = 'py-thrift',
   sources = ['thermos_internal.thrift'],
   provides = setup_py(
     name = 'twitter.gen.thermos',
-    version = '0.1.1',
+    version = open(os.path.join(get_buildroot(), '.auroraversion')).read().strip().lower(),
     description = 'Autogenerated Thermos thrift schemas.',
   )
 )


Mime
View raw message