Skip to content

Commit c392f2b

Browse files
committed
CI fixes
1 parent 6a93f10 commit c392f2b

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Install dependencies
4242
run: |
4343
if [ "$RUNNER_OS" == "Linux" ]; then
44-
sudo apt-get -y install libncurses5-dev libncursesw5-dev libncurses5
44+
sudo apt-get update && sudo apt-get -y install libncurses-dev
4545
fi
4646
python -m pip install --upgrade pip
4747
pip install -r requirements-dev.txt
@@ -73,7 +73,7 @@ jobs:
7373
uses: docker/login-action@v2
7474
with:
7575
registry: ghcr.io
76-
username: ${{ secrets.GHCR_USER }}
76+
username: ${{ github.actor }}
7777
password: ${{ secrets.GITHUB_TOKEN }}
7878

7979
- name: Extract metadata (tags, labels) for Docker

Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ LABEL org.opencontainers.image.source=https://github.com/RuleWorld/PyBioNetGen
66
LABEL org.opencontainers.image.description="PyBNG container"
77
LABEL org.opencontainers.image.licenses=MIT
88
RUN apt-get update && apt-get install -y \
9-
libncurses5-dev \
10-
libncursesw5-dev \
11-
libncurses5
9+
libncurses-dev
1210
WORKDIR /src
1311
COPY . /src
1412
RUN pip install --no-cache-dir -r requirements.txt

bionetgen/main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
# require version argparse action
2020
import argparse, sys
21-
from pkg_resources import packaging
21+
from packaging import version as packaging_version
2222

2323

2424
class requireAction(argparse.Action):
@@ -30,9 +30,9 @@ def __init__(self, option_strings, dest, nargs=None, **kwargs):
3030
def __call__(self, parser, namespace, values, option_string=None):
3131
setattr(namespace, self.dest, values)
3232
if values is not None:
33-
req_version = packaging.version.parse(values)
33+
req_version = packaging_version.parse(values)
3434
cver = bng.core.version.get_version()
35-
cur_version = packaging.version.parse(cver)
35+
cur_version = packaging_version.parse(cver)
3636
# if we don't meet requirement, warn user
3737
sys.tracebacklimit = 0
3838
if not (cur_version >= req_version):

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ networkx
1313
python-libsbml
1414
pylru
1515
pyparsing
16-
pyyed
16+
packaging
17+
pyyed

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,5 +199,6 @@ def get_folder (arch):
199199
"python-libsbml",
200200
"pylru",
201201
"pyparsing",
202+
"packaging",
202203
],
203204
)

0 commit comments

Comments
 (0)