Skip to content

Commit 84d0688

Browse files
committed
fix pip version in action
1 parent ffb1c3e commit 84d0688

File tree

10 files changed

+64
-275
lines changed

10 files changed

+64
-275
lines changed

.github/workflows/build-and-release.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333

3434
- name: Install python dependencies
3535
run: |
36-
python -m pip install --upgrade pip
37-
pip install setuptools wheel coveralls check-manifest
36+
python -m pip install pip==24.0
37+
pip install setuptools wheel check-manifest
3838
pip install -e .[tests]
3939
4040
- name: Show python dependencies
@@ -55,22 +55,6 @@ jobs:
5555
run: |
5656
docker-compose -f docker-compose.test.py2.yml run --rm ${{ matrix.suite }}
5757
58-
- name: Coveralls
59-
uses: AndreMiras/coveralls-python-action@v20201129
60-
with:
61-
parallel: true
62-
github-token: ${{ secrets.github_token }}
63-
flag-name: run-${{ matrix.test_number }}
64-
65-
Coveralls:
66-
needs: Test
67-
runs-on: ubuntu-latest
68-
steps:
69-
- name: Coveralls Finished
70-
uses: AndreMiras/coveralls-python-action@v20201129
71-
with:
72-
github-token: ${{ secrets.github_token }}
73-
parallel-finished: true
7458
7559
Release:
7660
if: ${{ github.event_name == 'push' }}
@@ -85,7 +69,7 @@ jobs:
8569
- name: Install python dependencies
8670
run: |
8771
pip install --user --upgrade pip
88-
pip --no-cache-dir install --user setuptools wheel coveralls check-manifest
72+
pip --no-cache-dir install --user setuptools wheel check-manifest
8973
pip --no-cache-dir install --user -e .[tests]
9074
9175
- name: Build package

.github/workflows/test-py3.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Test python 3
2+
3+
on:
4+
push:
5+
branches: [celery-5]
6+
pull_request:
7+
branches: [celery-5]
8+
9+
10+
jobs:
11+
Test:
12+
runs-on: ubuntu-latest
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
python-version: ["3.9", "3.11", "3.12"]
17+
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
22+
- name: Set up Python ${{ matrix.python-version }}
23+
uses: actions/setup-python@v5
24+
with:
25+
python-version: ${{ matrix.python-version }}
26+
27+
- name: Install python dependencies
28+
run: |
29+
python -m pip install --upgrade pip
30+
pip install -e .[all]
31+
32+
- name: Show python dependencies
33+
run: |
34+
pip freeze
35+
36+
- name: Run tests
37+
run: |
38+
py.test -vv tests/unit

README.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
.. image:: https://img.shields.io/travis/inspirehep/hepcrawl.svg
1515
:target: https://travis-ci.org/inspirehep/hepcrawl
1616

17-
.. image:: https://img.shields.io/coveralls/inspirehep/hepcrawl.svg
18-
:target: https://coveralls.io/r/inspirehep/hepcrawl
19-
2017
.. image:: https://img.shields.io/github/tag/inspirehep/hepcrawl.svg
2118
:target: https://github.com/inspirehep/hepcrawl/releases
2219

docker-compose.deps.py3.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

docker-compose.test.py3.yml

Lines changed: 0 additions & 204 deletions
This file was deleted.

docs/index.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
<img src="https://travis-ci.org/inspirehep/hepcrawl.png?branch=master"
1414
alt="travis-ci badge"/>
1515
</a>
16-
<a href="https://coveralls.io/r/inspirehep/hepcrawl">
17-
<img src="https://coveralls.io/repos/inspirehep/hepcrawl/badge.png?branch=master"
18-
alt="coveralls.io badge"/>
19-
</a>
2016
</p>
2117

2218

setup.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@
1717

1818
install_requires = [
1919
'automat==20.2.0',
20-
'amqp~=2.0,>2.2.0,!=2.3.0',
20+
'amqp',
2121
'autosemver~=0.2',
2222
"backports.tempfile==1.0",
2323
'boto3~=1.14',
24+
'dojson==1.4.0',
2425
'inspire-schemas~=61.5',
2526
'inspire-dojson~=63.0',
2627
'inspire-utils~=3.0,>=3.0.0',
2728
# newer scrapy is incompatible with old scrapyd
2829
'Scrapy~=1.6,<1.7.0',
30+
'parsel<=1.8.0',
2931
'scrapy-crawl-once~=0.1,>=0.1.1',
3032
'scrapy-sentry~=0.0,>=0.8.0',
3133
# TODO: unpin once they support wheel building again, needed for Python 3
@@ -44,13 +46,14 @@
4446
'harvestingkit>=0.6.12',
4547
'Sickle~=0.6,>=0.6.2',
4648
# newer versions seem incompatible with required scrapyd version
47-
'Twisted~=18.0,>=18.9.0',
49+
'Twisted~=18.0,>=18.9.0; python_version == "2.7"',
50+
'Twisted>=21.2.0; python_version >= "3"',
4851
#latex parsing
4952
'pylatexenc~=2.9',
50-
'queuelib==1.5.0',
51-
'sentry-sdk==1.3.0',
52-
'structlog==20.1.0',
53-
'python-logstash==0.4.8',
53+
'queuelib>=1.5.0',
54+
'sentry-sdk>=0.10.0',
55+
'structlog>=19.0.0',
56+
'python-logstash>=0.4.8',
5457
]
5558

5659
tests_require = [
@@ -60,7 +63,7 @@
6063
'freezegun>=0.3.9',
6164
'isort==4.2.2',
6265
'mock~=2.0,>=2.0.0',
63-
'pytest>=2.8.0',
66+
'pytest>=2.8.0, <8.0.0',
6467
'pytest-cov>=2.1.0',
6568
'pytest-pep8>=1.0.6',
6669
'requests-mock>=1.3.0',

tests/Dockerfile.hepcrawl_py3

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)