Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Celery 5 master fix #351

Open
wants to merge 1 commit into
base: celery-5
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:

- name: Install python dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel coveralls check-manifest
python -m pip install pip==24.0
pip install setuptools wheel check-manifest
pip install -e .[tests]

- name: Show python dependencies
Expand All @@ -55,22 +55,6 @@ jobs:
run: |
docker-compose -f docker-compose.test.py2.yml run --rm ${{ matrix.suite }}

- name: Coveralls
uses: AndreMiras/coveralls-python-action@v20201129
with:
parallel: true
github-token: ${{ secrets.github_token }}
flag-name: run-${{ matrix.test_number }}

Coveralls:
needs: Test
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: AndreMiras/coveralls-python-action@v20201129
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true

Release:
if: ${{ github.event_name == 'push' }}
Expand All @@ -85,7 +69,7 @@ jobs:
- name: Install python dependencies
run: |
pip install --user --upgrade pip
pip --no-cache-dir install --user setuptools wheel coveralls check-manifest
pip --no-cache-dir install --user setuptools wheel check-manifest
pip --no-cache-dir install --user -e .[tests]

- name: Build package
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/test-py3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Test python 3

on:
push:
branches: [celery-5]
pull_request:
branches: [celery-5]


jobs:
Test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: ["3.9", "3.11", "3.12"]

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Install python dependencies
run: |
python -m pip install --upgrade pip
pip install -e .[all]

- name: Show python dependencies
run: |
pip freeze

- name: Run tests
run: |
py.test -vv tests/unit
3 changes: 0 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
.. image:: https://img.shields.io/travis/inspirehep/hepcrawl.svg
:target: https://travis-ci.org/inspirehep/hepcrawl

.. image:: https://img.shields.io/coveralls/inspirehep/hepcrawl.svg
:target: https://coveralls.io/r/inspirehep/hepcrawl

.. image:: https://img.shields.io/github/tag/inspirehep/hepcrawl.svg
:target: https://github.com/inspirehep/hepcrawl/releases

Expand Down
20 changes: 0 additions & 20 deletions docker-compose.deps.py3.yml

This file was deleted.

204 changes: 0 additions & 204 deletions docker-compose.test.py3.yml

This file was deleted.

4 changes: 0 additions & 4 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
<img src="https://travis-ci.org/inspirehep/hepcrawl.png?branch=master"
alt="travis-ci badge"/>
</a>
<a href="https://coveralls.io/r/inspirehep/hepcrawl">
<img src="https://coveralls.io/repos/inspirehep/hepcrawl/badge.png?branch=master"
alt="coveralls.io badge"/>
</a>
</p>


Expand Down
17 changes: 10 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@

install_requires = [
'automat==20.2.0',
'amqp~=2.0,>2.2.0,!=2.3.0',
'amqp',
'autosemver~=0.2',
"backports.tempfile==1.0",
'boto3~=1.14',
'dojson==1.4.0',
'inspire-schemas~=61.5',
'inspire-dojson~=63.0',
'inspire-utils~=3.0,>=3.0.0',
# newer scrapy is incompatible with old scrapyd
'Scrapy~=1.6,<1.7.0',
'parsel<=1.8.0',
'scrapy-crawl-once~=0.1,>=0.1.1',
'scrapy-sentry~=0.0,>=0.8.0',
# TODO: unpin once they support wheel building again, needed for Python 3
Expand All @@ -44,13 +46,14 @@
'harvestingkit>=0.6.12',
'Sickle~=0.6,>=0.6.2',
# newer versions seem incompatible with required scrapyd version
'Twisted~=18.0,>=18.9.0',
'Twisted~=18.0,>=18.9.0; python_version == "2.7"',
'Twisted>=21.2.0; python_version >= "3"',
#latex parsing
'pylatexenc~=2.9',
'queuelib==1.5.0',
'sentry-sdk==1.3.0',
'structlog==20.1.0',
'python-logstash==0.4.8',
'queuelib>=1.5.0',
'sentry-sdk>=0.10.0',
'structlog>=19.0.0',
'python-logstash>=0.4.8',
]

tests_require = [
Expand All @@ -60,7 +63,7 @@
'freezegun>=0.3.9',
'isort==4.2.2',
'mock~=2.0,>=2.0.0',
'pytest>=2.8.0',
'pytest>=2.8.0, <8.0.0',
'pytest-cov>=2.1.0',
'pytest-pep8>=1.0.6',
'requests-mock>=1.3.0',
Expand Down
14 changes: 0 additions & 14 deletions tests/Dockerfile.hepcrawl_py3

This file was deleted.

Loading
Loading