#313 Add python2-prometheus_client dependecy to spec file; Drop EPEL7 support
Merged 6 months ago by jkaluza. Opened 6 months ago by lholecek.
lholecek/freshmaker fix-spec-file  into  master

file modified
+1 -1

@@ -3,7 +3,7 @@ 

  	python setup.py sdist

  	cp ./dist/*.tar.gz ./.copr

  	touch ./.copr/sources

- 	fedpkg --path ./.copr --release el7 srpm

+ 	fedpkg --path ./.copr --release f28 srpm

  	cp ./.copr/*.src.rpm $(outdir)

  clean:

  	rm -f .copr/*.tar.gz .copr/sources .copr/*.spec .copr/*.src.rpm

@@ -1,13 +0,0 @@ 

- diff --git a/requirements.txt b/requirements.txt

- index 3f71e88..9145207 100644

- --- a/requirements.txt

- +++ b/requirements.txt

- @@ -20,7 +20,7 @@ Flask-SQLAlchemy

-  Flask-Script

-  Flask-Login

-  requests

- -enum34 ; python_version <= '2.7'

- +enum34

-  odcs[client]

-  krbcontext

-  dogpile.cache

file modified
+2 -44

@@ -7,15 +7,8 @@ 

  License:    MIT

  URL:        https://pagure.io/freshmaker

  Source0:    https://files.pythonhosted.org/packages/source/o/%{name}/%{name}-%{version}.tar.gz

- Patch0:     freshmaker-enum34-requirement.patch

  

- %if 0%{?rhel} && 0%{?rhel} <= 7

- # In EL7 we need flask which needs python-itsdangerous which comes from

- # rhel7-extras which is only available on x86_64 for now.

- ExclusiveArch: %{ix86} x86_64

- %else

  BuildArch:    noarch

- %endif

  

  BuildRequires:    fedmsg-hub

  BuildRequires:    help2man

@@ -41,22 +34,6 @@ 

  BuildRequires:    python-qpid-proton

  BuildRequires:    python2-tabulate

  

- %if 0%{?rhel} && 0%{?rhel} <= 7

- BuildRequires:    python-setuptools

- BuildRequires:    python-fedora

- BuildRequires:    python-flask

- BuildRequires:    python-flask-sqlalchemy

- BuildRequires:    python-mock

- BuildRequires:    python-nose

- BuildRequires:    python-psutil

- BuildRequires:    pytest

- BuildRequires:    pyOpenSSL

- BuildRequires:    python-six

- BuildRequires:    python-sqlalchemy

- BuildRequires:    koji

- BuildRequires:    python-psycopg2

- BuildRequires:    python-lxml

- %else

  BuildRequires:    python2-setuptools

  BuildRequires:    python2-fedora

  BuildRequires:    python2-flask

@@ -71,7 +48,7 @@ 

  BuildRequires:    python2-koji

  BuildRequires:    python2-psycopg2

  BuildRequires:    python2-lxml

- %endif

+ BuildRequires:    python2-prometheus_client

  

  BuildRequires:    systemd

  %{?systemd_requires}

@@ -99,21 +76,6 @@ 

  Requires:    python-qpid-proton

  Requires:    python2-tabulate

  

- %if 0%{?rhel} && 0%{?rhel} <= 7

- Requires:    python-fedora

- Requires:    python-flask

- Requires:    python-flask-migrate

- Requires:    python-flask-sqlalchemy

- Requires:    python-mock

- Requires:    python-psutil

- Requires:    pyOpenSSL

- Requires:    python-six

- Requires:    python-sqlalchemy

- Requires:    koji

- Requires:    systemd-python

- Requires:    python-psycopg2

- Requires:    python-lxml

- %else

  Requires:    python2-koji

  Requires:    python2-fedora

  Requires:    python2-flask

@@ -127,7 +89,7 @@ 

  Requires:    python2-systemd

  Requires:    python2-psycopg2

  Requires:    python2-lxml

- %endif

+ Requires:    python2-prometheus_client

  

  

  %description

@@ -137,10 +99,6 @@ 

  %prep

  %setup -q

  

- %if 0%{?rhel} && 0%{?rhel} <= 7

- %patch0 -p1 -b .enum34

- %endif

- 

  sed -i '/ldap/d' requirements.txt

  sed -i '/koji/d' requirements.txt

  

file modified
+2 -12

@@ -42,14 +42,12 @@ 

  

      timestamps {

  

- node('fedora') {

+ node('fedora-28') {

      checkout scm

      stage('Prepare') {

          sh 'sudo rm -f rpmbuild-output/*.src.rpm'

          sh 'mkdir -p rpmbuild-output'

          sh 'make -f .copr/Makefile srpm outdir=./rpmbuild-output/'

-         /* Needed for mock EPEL7 builds: https://bugzilla.redhat.com/show_bug.cgi?id=1528272 */

-         sh 'sudo dnf -y install dnf-utils'

          sh 'sudo dnf -y builddep ./rpmbuild-output/freshmaker-*.src.rpm'

          sh 'sudo dnf -y install python2-tox python3-tox'

          /* Needed to get the latest /etc/mock/fedora-28-x86_64.cfg */

@@ -63,14 +61,6 @@ 

       * time, which will error out. */

      stage('Build RPM') {

          parallel (

-             'EPEL7': {

-                 sh """

-                 mkdir -p mock-result/el7

-                 flock /etc/mock/epel-7-x86_64.cfg \

-                 /usr/bin/mock -v --enable-network --resultdir=mock-result/el7 -r epel-7-x86_64 --clean --rebuild rpmbuild-output/*.src.rpm

-                 """

-                 archiveArtifacts artifacts: 'mock-result/el7/**'

-             },

              'F28': {

                  sh """

                  mkdir -p mock-result/f28

@@ -208,4 +198,4 @@ 

                          ]

          }

      }

- } 

\ No newline at end of file

+ }

no initial comment

1 new commit added

  • Use f28 to run tests on Jenkins instead of the default f27
6 months ago

Pull-Request has been merged by jkaluza

6 months ago