You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by le...@apache.org on 2016/02/05 06:08:03 UTC

[1/2] climate git commit: CLIMATE-725 Ensure that OCW 1.1 Test PyPi Works as Expected

Repository: climate
Updated Branches:
  refs/heads/master 687ab5877 -> 6ae76c6ef


CLIMATE-725 Ensure that OCW 1.1 Test PyPi Works as Expected


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/8a349427
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/8a349427
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/8a349427

Branch: refs/heads/master
Commit: 8a349427b739937166cca59fc23d1943613222f4
Parents: 584dfd4
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Thu Jan 28 23:16:46 2016 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Thu Jan 28 23:16:46 2016 -0800

----------------------------------------------------------------------
 MANIFEST.in | 3 ++-
 setup.cfg   | 4 ----
 setup.py    | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/8a349427/MANIFEST.in
----------------------------------------------------------------------
diff --git a/MANIFEST.in b/MANIFEST.in
index 4e8da59..a68e4b8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
 include distribute_setup.py
-recursive-include docs *.txt
\ No newline at end of file
+recursive-include docs *.txt
+include README.md

http://git-wip-us.apache.org/repos/asf/climate/blob/8a349427/setup.cfg
----------------------------------------------------------------------
diff --git a/setup.cfg b/setup.cfg
index f65f18a..3725441 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,7 +15,3 @@
 
 [metadata]
 description-file = README.md
-
-[egg_info]
-tag_build = .dev
-tag_svn_revision = 1

http://git-wip-us.apache.org/repos/asf/climate/blob/8a349427/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 2fa0733..7349c05 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,6 @@ setup(
     name=_name,
     namespace_packages=_namespaces,
     packages=find_packages(),
-    #_packages     = ['ocw', 'ocw.data_source', 'ocw.tests', 'ocw.esgf']
     test_suite=_testSuite,
     url=_url,
     version=_version,


[2/2] climate git commit: Merge branch 'CLIMATE-725' this closes #286

Posted by le...@apache.org.
Merge branch 'CLIMATE-725' this closes #286


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/6ae76c6e
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/6ae76c6e
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/6ae76c6e

Branch: refs/heads/master
Commit: 6ae76c6efad1fbd5f9f3716a15f67049640b4113
Parents: 687ab58 8a34942
Author: Lewis John McGibbney <le...@jpl.nasa.gov>
Authored: Thu Feb 4 21:10:58 2016 -0800
Committer: Lewis John McGibbney <le...@jpl.nasa.gov>
Committed: Thu Feb 4 21:10:58 2016 -0800

----------------------------------------------------------------------
 MANIFEST.in | 3 ++-
 setup.cfg   | 4 ----
 setup.py    | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/6ae76c6e/setup.py
----------------------------------------------------------------------