Skip to content
Permalink
Browse files

Applied updates and changes to setup.py for bdist_rpm (#327)

  • Loading branch information...
joachimmetz committed Mar 20, 2019
1 parent e3a91f9 commit 55391369da1c9f62d658ec71e446b7f14218c228
Showing with 19 additions and 19 deletions.
  1. +1 −1 artifacts/__init__.py
  2. +2 −2 config/dpkg/changelog
  3. +5 −3 config/travis/install.sh
  4. +4 −2 setup.py
  5. +4 −0 test_requirements.txt
  6. +3 −11 tox.ini
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
"""ForensicArtifacts.com Artifact Repository."""

__version__ = '20190319'
__version__ = '20190320'
@@ -1,5 +1,5 @@
artifacts (20190319-1) unstable; urgency=low
artifacts (20190320-1) unstable; urgency=low

* Auto-generated

-- Forensic artifacts <forensicartifacts@googlegroups.com> Tue, 19 Mar 2019 06:43:58 +0100
-- Forensic artifacts <forensicartifacts@googlegroups.com> Wed, 20 Mar 2019 05:20:33 +0100
@@ -84,18 +84,20 @@ then
docker run --name=${CONTAINER_NAME} --detach -i ubuntu:${UBUNTU_VERSION};

docker exec ${CONTAINER_NAME} apt-get update -q;
docker exec ${CONTAINER_NAME} sh -c "DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common";
docker exec ${CONTAINER_NAME} sh -c "DEBIAN_FRONTEND=noninteractive apt-get install -y locales software-properties-common";

docker exec ${CONTAINER_NAME} add-apt-repository ppa:gift/dev -y;

docker exec ${CONTAINER_NAME} locale-gen en_US.UTF-8;

if test -n "${TOXENV}";
then
docker exec ${CONTAINER_NAME} add-apt-repository universe;
docker exec ${CONTAINER_NAME} add-apt-repository ppa:deadsnakes/ppa -y;

DPKG_PYTHON="python${TRAVIS_PYTHON_VERSION}";
DPKG_PYTHON="python${TRAVIS_PYTHON_VERSION} python${TRAVIS_PYTHON_VERSION}-dev";

docker exec ${CONTAINER_NAME} sh -c "DEBIAN_FRONTEND=noninteractive apt-get install -y ${DPKG_PYTHON} tox";
docker exec ${CONTAINER_NAME} sh -c "DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential ${DPKG_PYTHON} tox";

elif test ${TRAVIS_PYTHON_VERSION} = "2.7";
then
@@ -124,7 +124,8 @@ def _make_spec_file(self):
elif line.startswith('%files'):
python_spec_file.extend([
'%package -n %{name}-tools',
'Requires: {0:s}-artifacts'.format(python_package),
'Requires: {0:s}-artifacts >= %{{version}}'.format(
python_package),
'Summary: Tools for {0:s}'.format(summary),
'',
'%description -n %{name}-tools'])
@@ -185,7 +186,8 @@ def _make_spec_file(self):
python_summary = 'Python 3 module of {0:s}'.format(summary)

python_spec_file.extend([
'Requires: artifacts-data {0:s}'.format(requires),
'Requires: artifacts-data >= %{{version}} {0:s}'.format(
requires),
'Summary: {0:s}'.format(python_summary),
'',
'%description -n {0:s}-%{{name}}'.format(python_package)])
@@ -0,0 +1,4 @@
funcsigs >= 1.0.2 ; python_version < '3.0'
mock >= 2.0.0
pbr >= 4.2.0
six >= 1.1.0
14 tox.ini
@@ -6,12 +6,8 @@ pip_pre = True
setenv =
PYTHONPATH = {toxinidir}
deps =
funcsigs ; python_version < '3.0'
mock
pbr
six
pytest
-rrequirements.txt
-rtest_requirements.txt
commands =
./run_tests.py

@@ -20,13 +16,9 @@ pip_pre = True
setenv =
PYTHONPATH = {toxinidir}
deps =
coverage
funcsigs ; python_version < '3.0'
mock
pbr
six
pytest
-rrequirements.txt
-rtest_requirements.txt
coverage
commands =
coverage erase
coverage run --source=artifacts --omit="*_test*,*__init__*,*test_lib*" run_tests.py

0 comments on commit 5539136

Please sign in to comment.
You can’t perform that action at this time.