Skip to content

Commit

Permalink
generic: bump and clean dependencies
Browse files Browse the repository at this point in the history
add dockerfiles for local tesing

* ref: cern-sis/issues-inspire/issues/625
  • Loading branch information
DonHaul committed Dec 3, 2024
1 parent 5ead0da commit af14dc4
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bump-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install setuptools wheel
pip install -e .[tests,elasticsearch5]
pip install -e .[tests]
- name: Show python dependencies
run: |
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test-python-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ jobs:
wget https://bootstrap.pypa.io/pip/2.7/get-pip.py
${{ matrix.python }} get-pip.py
${{ matrix.python }} -m ${{ matrix.pip }} install --user --upgrade pip
${{ matrix.python }} -m ${{ matrix.pip }} --no-cache-dir install --user setuptools wheel "urllib3==1.25.11"
${{ matrix.python }} -m ${{ matrix.pip }} --no-cache-dir install --user -e .[tests,elasticsearch5]
${{ matrix.python }} -m ${{ matrix.pip }} --no-cache-dir install --user -e .[tests]
- name: Show python dependencies
run: |
Expand All @@ -33,4 +32,4 @@ jobs:
- name: Run tests
run: |
./run-tests.sh
pytest tests
2 changes: 1 addition & 1 deletion .github/workflows/test-python-3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ jobs:
- name: Run tests
run: |
./run-tests.sh
pytest tests
8 changes: 8 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM python:2.7.18-buster


COPY . .

# RUN python2.7 -m pip install -e .[tests]

CMD ["/bin/bash"]
4 changes: 4 additions & 0 deletions Dockerfile.py2
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM python:2.7.18-buster
COPY . .
RUN python -m pip install -e .[tests]
CMD ["/bin/bash"]
29 changes: 22 additions & 7 deletions README.rst → README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
..

<!--
This file is part of INSPIRE.
Copyright (C) 2014-2024 CERN.
Expand All @@ -18,13 +19,27 @@
In applying this license, CERN does not waive the privileges and immunities
granted to it by virtue of its status as an Intergovernmental Organization
or submit itself to any jurisdiction.
-->

# INSPIRE-Utils

===============
INSPIRE-Utils
===============
### About
INSPIRE-specific utils.

About
=====

INSPIRE-specific utils.
### Development

Tests should be run both for python 2 and python 3.
For python 2 its recommended to run them through docker:
```bash
# building the image python 3 and python 2
docker build -f Dockerfile.py2 -t inspire-utils:py2 .
docker run inspire-utils:py2 pytest tests
```

For python 3 you can run them locally:
```bash
pip install .[tests]
pytest tests
```

24 changes: 0 additions & 24 deletions run-tests.sh

This file was deleted.

14 changes: 6 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,16 @@

URL = "https://github.com/inspirehep/inspire-utils"

with open("README.rst") as f:
with open("README.md") as f:
readme = f.read()

install_requires = [
'Unidecode~=1.0,>=1.0.22',
'babel~=2.0,>=2.5.1',
'Unidecode~=1.0,>=1.2.0',
'babel~=2.9,>=2.9.1',
'lxml~=5.0',
'nameparser~=0.0,>=0.5.3;python_version <= "2.7"',
'nameparser~=1.1,>=1.1.3;python_version >= "3.6"',
'python-dateutil~=2.0,>=2.6.1',
'six~=1.0,>=1.10.0',
'urllib3~=1.0,<=1.26.12'
'nameparser~=1.1,>=1.1.3',
'python-dateutil~=2.9,>=2.9.0',
'six~=1.0,>=1.10.0'
]

docs_require = []
Expand Down

0 comments on commit af14dc4

Please sign in to comment.