[javapackages] Simplify setup.py
by Michal Srb
commit 06683e39e3f49f2f1114216e908da6cf62706103
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Sep 29 16:17:28 2015 +0200
Simplify setup.py
python/setup.py | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/python/setup.py b/python/setup.py
index bc65f72..4ed55a3 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -1,5 +1,5 @@
import os
-from setuptools import setup
+from setuptools import setup, find_packages
dirpath = os.path.dirname(os.path.realpath(__file__))
versionpath = os.path.join(dirpath, "..", "VERSION")
@@ -17,9 +17,7 @@ setup(
license="BSD",
download_url="https://fedorahosted.org/released/javapackages/",
url="https://git.fedorahosted.org/git/javapackages.git",
- packages=["javapackages", "javapackages.maven", "javapackages.metadata",
- "javapackages.xmvn", "javapackages.common", "javapackages.ivy",
- "javapackages.cache"],
+ packages=find_packages(exclude=["test"]),
test_suite="test",
maintainer="javapackages maintainers",
maintainer_email="java-devel(a)lists.fedoraproject.org"
8 years, 7 months
[javapackages] Add comment explaining workaround for broken symlinks in Vagrantfile
by Michal Srb
commit 18c2a1f533d5ecf736b41cb3afaeea662c0055ed
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Sep 29 15:24:53 2015 +0200
Add comment explaining workaround for broken symlinks in Vagrantfile
Vagrantfile | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/Vagrantfile b/Vagrantfile
index ad5bfbd..fb7610e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,5 +4,6 @@ Vagrant.configure(2) do |config|
config.vm.box = "fedora-22"
config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86..."
config.vm.provision :shell, path: "vagrant_bootstrap.sh"
+ # workaround for intentionally broken symlinks in test suite: https://github.com/mitchellh/vagrant/issues/5471
config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__args: ["--verbose", "--archive", "--delete", "-z"]
end
8 years, 7 months
[javapackages] Add rpm-build to vagrant_bootstrap.sh
by Michal Srb
commit 9b506511ff13c37be64f290e0eb9bbc17fc2266d
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Sep 29 15:16:32 2015 +0200
Add rpm-build to vagrant_bootstrap.sh
vagrant_bootstrap.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/vagrant_bootstrap.sh b/vagrant_bootstrap.sh
index 5dede7f..3176295 100644
--- a/vagrant_bootstrap.sh
+++ b/vagrant_bootstrap.sh
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
dnf update -y
-dnf install -y python{,3} python{,3}-lxml python{,3}-six python{,3}-nose
+dnf install -y rpm-build python{,3} python{,3}-lxml python{,3}-six python{,3}-nose
8 years, 7 months
[javapackages] bootstrap.sh -> vagrant_bootstrap.sh rename
by Michal Srb
commit 9b5aa9f5039214c6794485b166a95492c8291bfa
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Sep 29 15:06:51 2015 +0200
bootstrap.sh -> vagrant_bootstrap.sh rename
Vagrantfile | 2 +-
bootstrap.sh => vagrant_bootstrap.sh | 0
2 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/Vagrantfile b/Vagrantfile
index 1edbb2d..ad5bfbd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,6 +3,6 @@
Vagrant.configure(2) do |config|
config.vm.box = "fedora-22"
config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86..."
- config.vm.provision :shell, path: "bootstrap.sh"
+ config.vm.provision :shell, path: "vagrant_bootstrap.sh"
config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__args: ["--verbose", "--archive", "--delete", "-z"]
end
diff --git a/bootstrap.sh b/vagrant_bootstrap.sh
similarity index 100%
rename from bootstrap.sh
rename to vagrant_bootstrap.sh
8 years, 7 months
[javapackages] Add provisioning for vagrant
by Michal Srb
commit 346a688dca13dd1fe555120a743014c3b00312ae
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Sep 29 14:37:10 2015 +0200
Add provisioning for vagrant
Vagrantfile | 2 ++
bootstrap.sh | 4 ++++
2 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/Vagrantfile b/Vagrantfile
index aff00c4..1edbb2d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,4 +3,6 @@
Vagrant.configure(2) do |config|
config.vm.box = "fedora-22"
config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86..."
+ config.vm.provision :shell, path: "bootstrap.sh"
+ config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__args: ["--verbose", "--archive", "--delete", "-z"]
end
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100644
index 0000000..5dede7f
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+dnf update -y
+dnf install -y python{,3} python{,3}-lxml python{,3}-six python{,3}-nose
8 years, 7 months
[javapackages] Revert "Initial attempt to integrate bundling-detection tool"
by Michal Srb
commit 5d05760685c05ad0f55b9ac01efeadc207ba6bea
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Sep 29 13:54:43 2015 +0200
Revert "Initial attempt to integrate bundling-detection tool"
This reverts commit a6d6c500cc63b4218cfe891b9fd22c6a5e7c8def.
Not fully prepared yet, reverting for now.
depgenerators/maven.req | 25 +------------------------
1 files changed, 1 insertions(+), 24 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 50ee30e..c144c0d 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -40,9 +40,7 @@ import traceback
from javapackages.common.config import get_config
from javapackages.common.util import (kill_parent_process,
init_rpmgen,
- get_logger,
- get_buildroot_files,
- execute_command)
+ get_logger)
from javapackages.cache.metadata import MetadataCache
from javapackages.maven.pom import POM
from javapackages.maven.dependency import Dependency
@@ -68,27 +66,6 @@ class TagBuilder(object):
self.provided_osgi = cache.get_provided_osgi()
self.metadata_dir = os.path.dirname(paths[0])
- if cache.is_fresh():
- detector = "/usr/bin/bundling-detector-java"
- if os.path.exists(detector) and os.access(detector, os.X_OK):
- check_files = get_buildroot_files(regexp="jar$")
- if len(check_files):
- check = " ".join(["'{f}'".format(f=x)
- for x in check_files])
- # TODO: do not hardcode these paths
- check_against = "/usr/share/java /usr/lib/java"
- cmd = "{c} -check {cf} -checkAgainst {ca}".format(c=detector,
- cf=check,
- ca=check_against)
- _log.info("Running bundling detection tool...")
- rc, stdout, stderr = execute_command(cmd)
- if stderr:
- _log.warn(stderr)
- if stdout:
- _log.info("===== bundling detection report =====")
- _log.info(stdout)
- _log.info("===== bundling detection report =====")
-
for path in paths:
metadata = cache.get_metadata_for_path(path)
self.print_requires(metadata)
8 years, 7 months