Skip to content

Commit 03fcbc3

Browse files
authored
Merge pull request #5 from kubantjan/fix-dependencies
Fix requirements + add github actions for pypi
2 parents 088c26c + 4a64cd4 commit 03fcbc3

File tree

7 files changed

+43
-159
lines changed

7 files changed

+43
-159
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Release to PyPI
2+
3+
on:
4+
release:
5+
types: [created]
6+
7+
jobs:
8+
release:
9+
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: Set up Python 3.7.9
15+
uses: actions/setup-python@v2
16+
with:
17+
python-version: 3.7.9
18+
- name: Install Tools
19+
run: |
20+
python -m pip install --upgrade pip
21+
pip install setuptools wheel twine
22+
- name: Package and Upload
23+
env:
24+
VERSION: ${{ github.event.release.tag_name }}
25+
TWINE_USERNAME: __token__
26+
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
27+
run: |
28+
python setup.py sdist bdist_wheel
29+
twine upload dist/*

Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
CONDA_ENV=fast-form
2+
3+
conda-create:
4+
conda env create -f conda.yml --name $(CONDA_ENV)
5+
6+
17
setup:
2-
pip install pip-tools
3-
pip-sync
8+
python -m pip install --upgrade setuptools
9+
python setup.py install
10+
411

512
setup-dev:
6-
pip install pip-tools
7-
pip-sync requirements.txt dev-requirements.txt
8-
pre-commit install
9-
10-
upload_to_pypi:
11-
pip install twine
12-
python setup.py sdist
13-
twine upload dist/*
13+
pip install -e .[dev]

dev-requirements.in

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

dev-requirements.txt

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

fast_form/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def get_parser():
2828
}
2929
""",
3030
default=os.path.join(os.path.dirname(__file__), "tests", "form1_for_test", "path_config.json"))
31-
par.add_argument('--final_step',
31+
par.add_argument('--final-step',
3232
action='store_true',
3333
default=False,
3434
help='If provided, the program will run the final step and output the final excel based on the'

requirements.txt

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

setup.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,9 @@
100100
# $ pip install -e .[dev,test]
101101
extras_require={
102102
'dev': [
103-
'matplotlib >= 3.3.1',
104-
'pre-commit >= 2.6.0',
105-
'jupyter',
106-
'ipykernel >= 5.3.4'
103+
'matplotlib',
104+
'ipykernel',
105+
'pre-commit'
107106
]
108107
},
109108

0 commit comments

Comments
 (0)