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

Make setup.py consistent with conda recipe #250

Merged
merged 3 commits into from
Feb 2, 2023
Merged
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
16 changes: 8 additions & 8 deletions .github/workflows/build_workflow.yml
Original file line number Diff line number Diff line change
@@ -13,18 +13,18 @@ jobs:
timeout-minutes: 2
steps:
- name: Checkout Code Repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Python 3.9
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.9

# Run all pre-commit hooks on all the files.
# Getting only staged files can be tricky in case a new PR is opened
# since the action is run on a branch in detached head state
- name: Install and Run Pre-commit
uses: pre-commit/action@v2.0.0
uses: pre-commit/action@v3.0.0

build:
runs-on: ubuntu-latest
@@ -33,10 +33,10 @@ jobs:
shell: bash -l {0}
timeout-minutes: 20
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.9

@@ -58,18 +58,18 @@ jobs:
shell: bash -l {0}
timeout-minutes: 5
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
persist-credentials: false
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.9

- name: Cache pip
uses: actions/cache@v2
uses: actions/cache@v3
with:
# This path is specific to Ubuntu
path: ~/.cache/pip
10 changes: 5 additions & 5 deletions .github/workflows/release_workflow.yml
Original file line number Diff line number Diff line change
@@ -12,18 +12,18 @@ jobs:
shell: bash -l {0}
timeout-minutes: 5
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
persist-credentials: false
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.9

- name: Cache pip
uses: actions/cache@v2
uses: actions/cache@v3
with:
# This path is specific to Ubuntu
path: ~/.cache/pip
@@ -86,10 +86,10 @@ jobs:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Cache Conda
uses: actions/cache@v2
uses: actions/cache@v3
env:
# Increase this value to reset cache if conda/zstash_dev.yml has not changed in the workflow
CACHE_NUMBER: 0
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@ repos:
hooks:
- id: black

- repo: https://github.com/timothycrosley/isort
rev: 5.7.0
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
hooks:
- id: isort

4 changes: 2 additions & 2 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -21,9 +21,9 @@ requirements:

run:
- python >=3.6
- fair-research-login >=0.2.6,<0.3.0
- globus-sdk >=3.0.0,<4.0.0
- six
- globus-sdk >=2
- fair-research-login

test:
imports:
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -7,10 +7,11 @@
author_email="[email protected], [email protected], [email protected]",
description="Long term HPSS archiving software for E3SM",
packages=find_packages(include=["zstash", "zstash.*"]),
python_requires=">=3.6",
install_requires=[
"six==1.16.0",
"globus-sdk<4.0.0>=3.0.0",
"fair-research-login==0.2.6",
"fair-research-login>=0.2.6,<0.3.0",
"globus-sdk>=3.0.0,<4.0.0",
"six",
],
entry_points={"console_scripts": ["zstash=zstash.main:main"]},
)