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

Polish top directory #1054

Merged
merged 11 commits into from
Aug 7, 2021
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ commands:
command: |
pip3 install --upgrade pip --user
pip3 install --upgrade setuptools
pip3 install -r requirements/tests.txt
<<# parameters.plugins >>pip3 install -r requirements/plugins.txt<</ parameters.plugins >>
pip3 install -r requirements/common.txt
pip3 install -r hub/requirements/tests.txt
<<# parameters.plugins >>pip3 install -r hub/requirements/plugins.txt<</ parameters.plugins >>
pip3 install -r hub/requirements/common.txt
pip3 install -e .
run-tests:
parameters:
Expand Down Expand Up @@ -308,7 +308,7 @@ jobs:
- run:
name: "Build Docker Hub Image"
command: |
docker build -t $IMAGE_NAME:latest .
docker build -t $IMAGE_NAME:latest -f bin/Dockerfile.
- run:
name: "Deploy to Docker Hub"
command: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ jobs:
with:
path: ~/.cache/pip # This path is specific to Ubuntu
# Look to see if there is a cache hit for the corresponding requirements file
key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
key: ${{ runner.os }}-pip-${{ hashFiles('hub/requirements/*.txt') }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements/common.txt
pip install -r requirements/tests.txt
pip install -r requirements/plugins.txt
pip install -r hub/requirements/common.txt
pip install -r hub/requirements/tests.txt
pip install -r hub/requirements/plugins.txt
- name: Install Hub
run: pip install -e .
- name: Check formatting with black
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ We use [pytest](https://docs.pytest.org/en/6.2.x/) for our tests. In order to ma
### To install all dependencies run:

```
pip3 install -r requirements/common.txt
pip3 install -r requirements/plugins.txt
pip3 install -r requirements/tests.txt
pip3 install -r hub/requirements/common.txt
pip3 install -r hub/requirements/plugins.txt
pip3 install -r hub/requirements/tests.txt
```


Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<img src="https://static.scarf.sh/a.png?x-pxid=bc3c57b0-9a65-49fe-b8ea-f711c4d35b82" /><p align="center">
<img src="https://github.com/activeloopai/Hub/blob/main/media/hub_logo.png" width="35%"/>
<img src="https://www.linkpicture.com/q/hub_logo-1.png" width="35%"/>
</br>
<h2 align="center">Dataset management for deep learning applications
</h2>
Expand Down
14 changes: 7 additions & 7 deletions Dockerfile → bin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ RUN apt-get -y update && \
RUN mkdir /app

RUN git clone https://github.com/activeloopai/Hub.git /app/ && \
cd /app/ && \
git checkout release/2.0
cd /app/

WORKDIR /app

RUN pip install -r requirements/requirements.txt && \
pip install -r requirements/common.txt && \
pip install -r requirements/tests.txt && \
pip install -r requirements/plugins.txt

ENV PYTHONPATH="/app/Hub:$PYTHONPATH"
RUN ls hub/
RUN pip install -r hub/requirements/requirements.txt && \
pip install -r hub/requirements/common.txt && \
pip install -r hub/requirements/tests.txt && \
pip install -r hub/requirements/plugins.txt

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file removed media/hub_logo.png
Binary file not shown.
Binary file removed media/hub_logo_compact.png
Binary file not shown.
1 change: 0 additions & 1 deletion runtime.txt

This file was deleted.

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

this_directory = os.path.abspath(os.path.dirname(__file__))

with open(os.path.join(this_directory, "requirements/common.txt")) as f:
with open(os.path.join(this_directory, "hub/requirements/common.txt")) as f:
requirements = f.readlines()

with open(os.path.join(this_directory, "requirements/tests.txt")) as f:
with open(os.path.join(this_directory, "hub/requirements/tests.txt")) as f:
tests = f.readlines()

with open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f:
Expand Down