Skip to content
This repository has been archived by the owner on May 16, 2022. It is now read-only.

Commit

Permalink
fix review
Browse files Browse the repository at this point in the history
  • Loading branch information
marusinm committed Oct 22, 2019
1 parent b48caf6 commit f25fa7e
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.app
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN dnf install -y ansible \
&& ansible-playbook -vv -c local -i localhost, files/install-rpm-packages.yaml \
&& dnf clean all

COPY setup.py setup.cfg requirements.txt files/recipe.yaml /src/
COPY setup.py setup.cfg files/recipe.yaml /src/
# setuptools-scm
COPY .git /src/.git
COPY release_bot/ /src/release_bot/
Expand Down
7 changes: 7 additions & 0 deletions files/install-rpm-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,11 @@
- python3-setuptools_scm
- python3-setuptools_scm_git_archive
- python3-wheel # for bdist_wheel
- python3-celery
- python3-cryptography
- python3-jwt
- python3-pystache
- python3-redis
- python3-semantic_version
- twine
state: present
4 changes: 0 additions & 4 deletions files/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@
src: run.sh
dest: /usr/bin/run.sh
mode: 0777
- name: Install ogr from git master
pip:
name: git+https://github.com/packit-service/ogr.git
executable: pip3
- name: Install release-bot from /src
pip:
name: /src
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ gitchangelog
pystache
celery[redis]
cryptography
ogr@git+https://github.com/packit-service/ogr@master#egg=ogr
ogr
42 changes: 36 additions & 6 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,36 +1,66 @@

[metadata]
name = release-bot
version = attr: release_bot.version.__version__
url = https://github.com/user-cont/release-bot
url = https://github.com/user-cont/release-bot/
description = Automated releasing from GitHub repositories.
long_description = file: README.md
long_description_content_type = text/markdown
author = Red Hat
author_email = [email protected]
license = GPLv3+
license = MIT
license_file = LICENSE
classifiers =
Development Status :: 4 - Beta
Environment :: Console
Intended Audience :: Developers
License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Operating System :: POSIX :: Linux
Programming Language :: Python :: 3
Programming Language :: Python
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Topic :: Software Development
Topic :: Utilities
keywords =
git
github
release
PyPI
packaging
fedora
rpm
dist-git


[options]
packages = find:
python_requires = >=3.6
include_package_data = True

setup_requires =
setuptools_scm
setuptools_scm_git_archive

install_requires =
PyYAML
requests
semantic_version
twine
wheel
PyJWT
flask
gitchangelog
pystache
celery
redis
cryptography
ogr>=0.7.0

[options.packages.find]
exclude =
tests*

[options.extras_require]
testing =
pytest

[options.entry_points]
console_scripts =
release-bot=release_bot.releasebot:main
17 changes: 17 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
#!/usr/bin/python3

# -*- coding: utf-8 -*-
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

from pathlib import Path
from setuptools import setup

Expand Down

0 comments on commit f25fa7e

Please sign in to comment.