Skip to content

Commit 560b230

Browse files
T4rk1nT4rk1n
authored
Merge pull request #2842 from Borda/requires-dir
refactor: move all requires-* to common folder
2 parents 4a9f09a + 1b252ad commit 560b230

File tree

10 files changed

+24
-23
lines changed

10 files changed

+24
-23
lines changed

‎.circleci/config.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
steps:
2020
- checkout
2121
- run: echo $PYVERSION > ver.txt
22-
- run: cat requires-*.txt > requires-all.txt
22+
- run: cat requirements/*.txt > requirements-all.txt
2323
- restore_cache:
24-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
24+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
2525
- attach_workspace:
2626
at: ~/dash
2727
- store_artifacts:
@@ -42,9 +42,9 @@ jobs:
4242
steps:
4343
- checkout
4444
- run: echo $PYVERSION > ver.txt
45-
- run: cat requires-*.txt > requires-all.txt
45+
- run: cat requirements/*.txt > requirements-all.txt
4646
- restore_cache:
47-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
47+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
4848
- run:
4949
name: 🏁 Build Component Packages & Update Dependencies/Artifacts
5050
command: |
@@ -67,7 +67,7 @@ jobs:
6767
cat /home/circleci/.npm/_logs/*
6868
fi
6969
- save_cache:
70-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
70+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
7171
paths:
7272
- venv
7373
- persist_to_workspace:
@@ -101,9 +101,9 @@ jobs:
101101
- checkout
102102
- run: sudo apt-get update
103103
- run: echo $PYVERSION > ver.txt
104-
- run: cat requires-*.txt > requires-all.txt
104+
- run: cat requirements/*.txt > requirements-all.txt
105105
- restore_cache:
106-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
106+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
107107
- browser-tools/install-browser-tools:
108108
chrome-version: 120.0.6099.71
109109
- run:
@@ -191,9 +191,9 @@ jobs:
191191
path: ~/dash
192192
- run: sudo apt-get update
193193
- run: echo $PYVERSION > ver.txt
194-
- run: cat requires-*.txt > requires-all.txt
194+
- run: cat requirements/*.txt > requirements-all.txt
195195
- restore_cache:
196-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
196+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
197197
- browser-tools/install-browser-tools:
198198
chrome-version: 120.0.6099.71
199199
install-firefox: false
@@ -268,9 +268,9 @@ jobs:
268268
- checkout:
269269
path: ~/dash
270270
- run: echo $PYVERSION > ver.txt
271-
- run: cat requires-*.txt > requires-all.txt
271+
- run: cat requirements/*.txt > requirements-all.txt
272272
- restore_cache:
273-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
273+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
274274
- run:
275275
name: 🌸 Lint
276276
command: |
@@ -308,9 +308,9 @@ jobs:
308308
path: ~/dash
309309
- run: sudo apt-get update
310310
- run: echo $PYVERSION > ver.txt
311-
- run: cat requires-*.txt > requires-all.txt
311+
- run: cat requirements/*.txt > requirements-all.txt
312312
- restore_cache:
313-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
313+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
314314
- browser-tools/install-browser-tools:
315315
chrome-version: 120.0.6099.71
316316
install-firefox: false
@@ -377,9 +377,9 @@ jobs:
377377
path: ~/dash
378378
- run: sudo apt-get update
379379
- run: echo $PYVERSION > ver.txt
380-
- run: cat requires-*.txt > requires-all.txt
380+
- run: cat requirements/*.txt > requirements-all.txt
381381
- restore_cache:
382-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
382+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
383383
- restore_cache:
384384
key: html-{{ checksum "components/dash-html-components/package.json" }}-{{ checksum "components/dash-html-components/package-lock.json" }}
385385
- browser-tools/install-browser-tools:
@@ -453,9 +453,9 @@ jobs:
453453
path: ~/dash
454454
- run: sudo apt-get update
455455
- run: echo $PYVERSION > ver.txt
456-
- run: cat requires-*.txt > requires-all.txt
456+
- run: cat requirements/*.txt > requirements-all.txt
457457
- restore_cache:
458-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
458+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
459459
- browser-tools/install-browser-tools:
460460
chrome-version: 120.0.6099.71
461461
install-firefox: false
@@ -507,9 +507,9 @@ jobs:
507507
path: ~/dash
508508
- run: sudo apt-get update
509509
- run: echo $PYVERSION > ver.txt
510-
- run: cat requires-*.txt > requires-all.txt
510+
- run: cat requirements/*.txt > requirements-all.txt
511511
- restore_cache:
512-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
512+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
513513
- restore_cache:
514514
key: table-{{ checksum "components/dash-table/package.json" }}-{{ checksum "components/dash-table/package-lock.json" }}
515515
- browser-tools/install-browser-tools:
@@ -581,9 +581,9 @@ jobs:
581581
- checkout:
582582
path: ~/dash
583583
- run: echo $PYVERSION > ver.txt
584-
- run: cat requires-*.txt > requires-all.txt
584+
- run: cat requirements/*.txt > requirements-all.txt
585585
- restore_cache:
586-
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
586+
key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requirements-all.txt" }}
587587
- restore_cache:
588588
key: dep-{{ .Branch }}-{{ checksum "components/dash-table/package-lock.json" }}-{{ checksum "components/dash-table/package.json" }}
589589
- run:

‎MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include README.md
22
include LICENSE
3-
include requires-*.txt
3+
include requirements/*.txt
44
include dash/favicon.ico
55
include dash/extract-meta.js
66
include dash/deps/*.js

‎requires-celery.txt renamed to ‎requirements/celery.txt

File renamed without changes.

‎requires-ci.txt renamed to ‎requirements/ci.txt

File renamed without changes.

‎requires-compress.txt renamed to ‎requirements/compress.txt

File renamed without changes.

‎requires-dev.txt renamed to ‎requirements/dev.txt

File renamed without changes.

‎requires-diskcache.txt renamed to ‎requirements/diskcache.txt

File renamed without changes.

‎requires-install.txt renamed to ‎requirements/install.txt

File renamed without changes.

‎requires-testing.txt renamed to ‎requirements/testing.txt

File renamed without changes.

‎setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import io
2+
import os
23
from setuptools import setup, find_packages
34

45
main_ns = {}
56
exec(open("dash/version.py", encoding="utf-8").read(), main_ns) # pylint: disable=exec-used, consider-using-with
67

78

89
def read_req_file(req_type):
9-
with open(f"requires-{req_type}.txt", encoding="utf-8") as fp:
10+
with open(os.path.join("requirements", f"{req_type}.txt"), encoding="utf-8") as fp:
1011
requires = (line.strip() for line in fp)
1112
return [req for req in requires if req and not req.startswith("#")]
1213

0 commit comments

Comments
 (0)